Upgrade to Django 3.0

.travis.yml

@@ -43,7 +43,6 @@ env:
     - DIFF_RESULTS_BASE_URL="http://dhrwmpu5reeyd.cloudfront.net"
     - QUERIES_RESULTS_PATH=/tmp/queries-results.json
   matrix:
-    - DJANGO="2.2"
     - DJANGO="3.0"
     - DJANGO="master"
 
@@ -63,16 +62,14 @@ matrix:
     - env: TOXENV=pydocstyle
       python: "3.8"
   allow_failures:
-    - env: DJANGO="3.0"
-      python: "3.8"
     - env: DJANGO="master"
       python: "3.8"
 
 services:
   - postgresql
 
 addons:
-  postgresql: 9.4
+  postgresql: 9.6
 
 after_success:
   - ../queries-ci-tools/handle-event.sh

pyproject.toml

@@ -20,11 +20,10 @@ braintree = "~3.49.0"
 celery = { version = "^4.3.0", extras = ["redis"] }
 dj-database-url = "^0"
 dj-email-url = "^0"
-django = "~2.2"
-django-babel = "^0"
+django = "^3.0.0"
 django-countries = "^5.3"
 django-filter = "^2.2"
-django-graphql-jwt = "<=0.2.1" # https://github.com/mirumee/saleor/issues/4652
+django-graphql-jwt = "^0.3.0" # https://github.com/mirumee/saleor/issues/4652
 django-measurement = "^3.0"
 django-mptt = "^0"
 django-phonenumber-field = "^2.4"
@@ -34,14 +33,14 @@ django-prices-vatlayer = "^1.0.2"
 django-silk = "~2.0"
 django-storages = { version = "^1.7.1", extras = [ "google" ] }
 django-templated-email = "^2.3.0"
-django-versatileimagefield = "^1.11"
+django-versatileimagefield = "^2.0"
 draftjs-sanitizer = "^1.0.0"
 faker = "^2.0"
 freezegun = "^0"
 google-cloud-storage = "^1.18.0"
 google-i18n-address = "^2.3.5"
 google-measurement-protocol = "^1.0"
-graphene-django = "2.6.0"
+graphene-django = "^2.8.0"
 graphene-django-optimizer = "^0.6"
 graphene-federation = "^0.0.3"
 html-to-draftjs = "^1.0.1"

requirements.txt

@@ -1,5 +1,6 @@
 amqp==2.5.2
 aniso8601==7.0.0
+asgiref==3.2.3
 autopep8==1.5
 babel==2.7.0
 beautifulsoup4==4.7.1
@@ -19,26 +20,26 @@ cssselect2==0.2.2
 defusedxml==0.6.0
 dj-database-url==0.5.0
 dj-email-url==0.2.0
-django==2.2.10
+django==3.0.4
 django-appconf==1.0.3
-django-babel==0.6.2
 django-countries==5.5
 django-filter==2.2.0
-django-graphql-jwt==0.2.1
+django-graphql-jwt==0.3.0
 django-js-asset==1.2.2
 django-measurement==3.2.0
 django-mptt==0.11.0
 django-phonenumber-field==2.4.0
-django-prices==2.1.0
-django-prices-openexchangerates==1.0.1
+django-prices==2.2.0
+django-prices-openexchangerates==1.1.0
 django-prices-vatlayer==1.0.2
 django-render-block==0.6
 django-silk==2.0.0
 django-storages==1.9.1
 django-templated-email==2.3.0
-django-versatileimagefield==1.11
+django-versatileimagefield==2.0
 docutils==0.15.2
 draftjs-sanitizer==1.0.0
+enmerkar==0.7.1
 faker==2.0.5
 freezegun==0.3.15
 google-api-core==1.16.0
@@ -51,7 +52,7 @@ google-resumable-media==0.5.0
 googleapis-common-protos==1.51.0
 gprof2dot==2016.10.13
 graphene==2.1.8
-graphene-django==2.6.0
+graphene-django==2.8.2
 graphene-django-optimizer==0.6.1
 graphene-federation==0.0.3
 graphql-core==2.3.1

requirements_dev.txt

@@ -2,6 +2,7 @@ amqp==2.5.2
 aniso8601==7.0.0
 apipkg==1.5
 appdirs==1.4.3
+asgiref==3.2.3
 aspy.yaml==1.3.0
 astroid==2.3.3
 atomicwrites==1.3.0; sys_platform == "win32"
@@ -33,31 +34,31 @@ defusedxml==0.6.0
 distlib==0.3.0
 dj-database-url==0.5.0
 dj-email-url==0.2.0
-django==2.2.10
+django==3.0.4
 django-appconf==1.0.3
-django-babel==0.6.2
 django-countries==5.5
 django-debug-toolbar==2.2
 django-debug-toolbar-request-history==0.1.1
 django-extensions==2.2.8
 django-filter==2.2.0
 django-graphiql-debug-toolbar==0.1.4
-django-graphql-jwt==0.2.1
+django-graphql-jwt==0.3.0
 django-js-asset==1.2.2
 django-measurement==3.2.0
 django-mptt==0.11.0
 django-phonenumber-field==2.4.0
-django-prices==2.1.0
-django-prices-openexchangerates==1.0.1
+django-prices==2.2.0
+django-prices-openexchangerates==1.1.0
 django-prices-vatlayer==1.0.2
 django-render-block==0.6
 django-silk==2.0.0
 django-storages==1.9.1
 django-stubs==1.2.0
 django-templated-email==2.3.0
-django-versatileimagefield==1.11
+django-versatileimagefield==2.0
 docutils==0.15.2
 draftjs-sanitizer==1.0.0
+enmerkar==0.7.1
 entrypoints==0.3
 execnet==1.7.1
 faker==2.0.5
@@ -74,7 +75,7 @@ google-resumable-media==0.5.0
 googleapis-common-protos==1.51.0
 gprof2dot==2016.10.13
 graphene==2.1.8
-graphene-django==2.6.0
+graphene-django==2.8.2
 graphene-django-optimizer==0.6.1
 graphene-federation==0.0.3
 graphql-core==2.3.1