Merge branch 'master' into dev

skyxv · Dec 5, 2019 · 8a02433 · 8a02433
2 parents 8a48ded + d5c7a02
commit 8a02433
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 42 deletions.
diff --git a/Pipfile b/Pipfile
@@ -16,6 +16,7 @@ djangorestframework-simplejwt = "*"
 redis = "*"
 celery = "*"
 uwsgi = "*"
+mysqlclient = "*"
 
 [requires]
 python_version = "3.5"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/requirements.txt b/requirements.txt
@@ -1,21 +1,22 @@
-amqp==2.4.2
+amqp==2.5.0
 billiard==3.6.0.0
 celery==4.3.0
 certifi==2019.3.9
 chardet==3.0.4
-django==2.2
-djangorestframework-simplejwt==4.1.5
-djangorestframework==3.9.2
+django==2.2.2
+djangorestframework-simplejwt==4.3.0
+djangorestframework==3.9.4
 idna==2.8
-kombu==4.5.0
+kombu==4.6.1
+mysqlclient==1.4.2.post1
 pyjwt==1.7.1
 pytz==2019.1
-pyyaml==5.1
+pyyaml==5.1.1
 redis==3.2.1
-requests==2.21.0
+requests==2.22.0
 sqlparse==0.3.0
 ua-parser==0.8.0
-urllib3==1.24.3
+urllib3==1.25.3
 user-agents==2.0
 uwsgi==2.0.18
 vine==1.3.0