Merge branch 'master' into add-products-csv-export

CHANGELOG.md

@@ -10,6 +10,9 @@ All notable, unreleased changes to this project will be documented in this file.
 - Add products csv export - #5255 by @IKarbowiak
 - Explicit country assignment in default shipping zones - #5736 by @maarcingebala
 - Drop `json_content` field from the `Menu` model - #5761 by @maarcingebala
+- Refactor JWT support - #5734 by @korycins
+- Strip warehouse name in mutations - #5766 by @koradon
+- Add missing OrderEvents during checkout flow - #5684 by @koradon
 
 ## 2.10.1
 

pyproject.toml

@@ -19,10 +19,9 @@ braintree = "~4.1.0"
 celery = { version = "^4.4.5", extras = ["redis"] }
 dj-database-url = "^0"
 dj-email-url = "^1"
-django = "^3.0.6"
+django = "3.0.6"
 django-countries = "^6.1"
 django-filter = "^2.3"
-django-graphql-jwt = "0.3.0" # https://github.com/mirumee/saleor/issues/4652
 django-measurement = "^3.0"
 django-mptt = "^0"
 django-phonenumber-field = "^4.0"
@@ -63,6 +62,8 @@ oauthlib = "^3.0"
 jaeger-client = "^4.3.0"
 openpyxl = "^3.0.3"
 django-cache-url = "^3.1.2"
+pyjwt = "^1.7.1"
+pytimeparse = "^1.1.8"
 
 [tool.poetry.dev-dependencies]
 black = "19.10b0"

requirements.txt

@@ -1,11 +1,11 @@
 amqp==2.6.0
 aniso8601==7.0.0
-asgiref==3.2.9
+asgiref==3.2.10
 babel==2.8.0
 beautifulsoup4==4.7.1
 billiard==3.6.3.0
-boto3==1.14.4
-botocore==1.17.4
+boto3==1.14.6
+botocore==1.17.6
 braintree==4.1.0
 cachetools==4.1.0
 cairocffi==1.1.0
@@ -23,7 +23,6 @@ django-appconf==1.0.4
 django-cache-url==3.1.2
 django-countries==6.1.2
 django-filter==2.3.0
-django-graphql-jwt==0.3.0
 django-js-asset==1.2.2
 django-measurement==3.2.3
 django-mptt==0.11.0
@@ -42,8 +41,8 @@ et-xmlfile==1.0.1
 faker==4.1.1
 freezegun==0.3.15
 future==0.18.2
-google-api-core==1.20.1
-google-auth==1.17.2
+google-api-core==1.21.0
+google-auth==1.18.0
 google-cloud-core==1.3.0
 google-cloud-storage==1.29.0
 google-i18n-address==2.3.5
@@ -73,7 +72,7 @@ oauthlib==3.1.0
 openpyxl==3.0.3
 opentracing==2.3.0
 petl==1.3.0
-phonenumberslite==8.12.5
+phonenumberslite==8.12.6
 pillow==7.1.2
 prices==1.0.0
 promise==2.3
@@ -88,14 +87,15 @@ pyphen==0.9.5
 python-dateutil==2.8.1
 python-magic==0.4.18
 python-magic-bin==0.4.14; sys_platform == "win32"
+pytimeparse==1.1.8
 pytz==2020.1
 razorpay==1.2.0
 redis==3.5.3
-requests==2.23.0
+requests==2.24.0
 rsa==4.6; python_version >= "3"
 rx==1.6.1
 s3transfer==0.3.3
-sentry-sdk==0.14.4
+sentry-sdk==0.15.1
 singledispatch==3.4.0.3
 six==1.15.0
 soupsieve==2.0.1
@@ -110,7 +110,7 @@ tornado==6.0.4
 tqdm==4.46.1
 typing==3.7.4.1
 urllib3==1.25.9
-uwsgi==2.0.19; sys_platform != "win32"
+uwsgi==2.0.19.1; sys_platform != "win32"
 vine==1.3.0
 weasyprint==51
 webencodings==0.5.1