Browse Source

Update Python to 3.9.1 and other Django requirements (#6301)

Small code fixes (redundant spaces)
Serhii Romanov 4 years ago
parent
commit
1105a4bb82

+ 2 - 2
frameworks/Python/django/django-postgresql.dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7-stretch
+FROM python:3.9.1-buster
 
 
 ADD ./ /django
 ADD ./ /django
 
 
@@ -8,4 +8,4 @@ RUN pip install -r /django/requirements.txt
 
 
 EXPOSE 8080
 EXPOSE 8080
 
 
-CMD gunicorn --pid=gunicorn.pid hello.wsgi:application -c gunicorn_conf.py --env DJANGO_DB=postgresql_psycopg2
+CMD gunicorn --pid=gunicorn.pid hello.wsgi:application -c gunicorn_conf.py --env DJANGO_DB=postgresql

+ 1 - 1
frameworks/Python/django/django.dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7-stretch
+FROM python:3.9.1-buster
 
 
 ADD ./ /django
 ADD ./ /django
 
 

+ 0 - 1
frameworks/Python/django/gunicorn_conf.py

@@ -24,4 +24,3 @@ else:
         # Disalbe access log
         # Disalbe access log
         import meinheld.server
         import meinheld.server
         meinheld.server.set_access_logger(None)
         meinheld.server.set_access_logger(None)
-

+ 5 - 5
frameworks/Python/django/hello/world/views.py

@@ -38,8 +38,8 @@ def json(request):
 def db(request):
 def db(request):
     r = _random_int()
     r = _random_int()
     world = uj_dumps({
     world = uj_dumps({
-        'id' : r,
-        'randomNumber' : World.objects.get(id=r).randomnumber
+        'id': r,
+        'randomNumber': World.objects.get(id=r).randomnumber
     })
     })
     return HttpResponse(world, content_type="application/json")
     return HttpResponse(world, content_type="application/json")
 
 
@@ -49,7 +49,7 @@ def dbs(request):
 
 
     def caller(input_):
     def caller(input_):
         int_ = _random_int()
         int_ = _random_int()
-        return {'id' : int_, 'randomNumber' : World.objects.get(id=int_).randomnumber}
+        return {'id': int_, 'randomNumber': World.objects.get(id=int_).randomnumber}
     worlds = tuple(map(caller, range(queries)))
     worlds = tuple(map(caller, range(queries)))
 
 
     return HttpResponse(uj_dumps(worlds), content_type="application/json")
     return HttpResponse(uj_dumps(worlds), content_type="application/json")
@@ -67,10 +67,10 @@ def update(request):
     queries = _get_queries(request)
     queries = _get_queries(request)
 
 
     def caller(input_):
     def caller(input_):
-        w = World.objects.get(id= _random_int())
+        w = World.objects.get(id=_random_int())
         w.randomnumber = _random_int()
         w.randomnumber = _random_int()
         w.save()
         w.save()
-        return {'id' : w.id, 'randomNumber' : w.randomnumber}
+        return {'id': w.id, 'randomNumber': w.randomnumber}
     worlds = tuple(map(caller, range(queries)))
     worlds = tuple(map(caller, range(queries)))
 
 
     return HttpResponse(uj_dumps(worlds), content_type="application/json")
     return HttpResponse(uj_dumps(worlds), content_type="application/json")

+ 6 - 6
frameworks/Python/django/requirements.txt

@@ -1,8 +1,8 @@
-Django==3.0.5
-greenlet==0.4.15
+Django==3.1.5
+greenlet==0.4.17
 gunicorn==20.0.4
 gunicorn==20.0.4
-meinheld==1.0.1
+meinheld==1.0.2
 mysqlclient==1.4.6
 mysqlclient==1.4.6
-psycopg2==2.8.5
-pytz==2019.3
-ujson==2.0.3
+psycopg2==2.8.6
+pytz==2020.4
+ujson==4.0.1