BOM-1045

-support latest version of drf-jwt -version bump
openedx · Mar 16, 2020 · f28a9e6 · f28a9e6
1 parent f6ca107
commit f28a9e6
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -69,3 +69,6 @@ target/
 
 # Temp file used by `make upgrade`
 test.tmp
+
+# vscode
+.vscode
diff --git a/edx_rest_framework_extensions/__init__.py b/edx_rest_framework_extensions/__init__.py
@@ -1,3 +1,3 @@
 """ edx Django REST Framework extensions. """
 
-__version__ = '4.0.2'  # pragma: no cover
+__version__ = '4.0.3'  # pragma: no cover
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -9,7 +9,7 @@ chardet==3.0.4            # via requests
 django-waffle==0.18.0     # via -c requirements/constraints.txt, -r requirements/base.in, edx-django-utils
 django==1.11.29           # via -c requirements/constraints.txt, -r requirements/base.in, djangorestframework, drf-jwt, edx-django-utils, rest-condition
 djangorestframework==3.11.0  # via -r requirements/base.in, drf-jwt, rest-condition
-drf-jwt==1.14.0           # via -c requirements/constraints.txt, -r requirements/base.in
+drf-jwt==1.15.0           # via -r requirements/base.in
 edx-django-utils==3.0     # via -r requirements/base.in
 edx-opaque-keys==2.0.1    # via -r requirements/base.in
 future==0.18.2            # via pyjwkest

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -13,6 +13,3 @@ django<2.0
 
 # django-waffle 0.19.0 dropped support for Django 2.0 and 2.1.
 django-waffle<0.19.0
-
-# django22 tests are failing.
-drf-jwt<1.15.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -20,7 +20,7 @@ django-waffle==0.18.0     # via -c requirements/constraints.txt, -r requirements
 django==1.11.29           # via -c requirements/constraints.txt, -r requirements/base.txt, -r requirements/test.txt, djangorestframework, drf-jwt, edx-django-utils, rest-condition
 djangorestframework==3.11.0  # via -r requirements/base.txt, -r requirements/test.txt, drf-jwt, rest-condition
 docutils==0.16            # via -r requirements/docs.txt, sphinx
-drf-jwt==1.14.0           # via -c requirements/constraints.txt, -r requirements/base.txt, -r requirements/test.txt
+drf-jwt==1.15.0           # via -r requirements/base.txt, -r requirements/test.txt
 edx-django-utils==3.0     # via -r requirements/base.txt, -r requirements/test.txt
 edx-lint==1.4.1           # via -r requirements/test.txt
 edx-opaque-keys==2.0.1    # via -r requirements/base.txt, -r requirements/test.txt
@@ -42,6 +42,7 @@ mock==1.3.0               # via -r requirements/test.txt
 more-itertools==8.2.0     # via -r requirements/test.txt, pytest
 newrelic==5.10.0.138      # via -r requirements/base.txt, -r requirements/test.txt, edx-django-utils
 packaging==20.3           # via -r requirements/docs.txt, -r requirements/test.txt, pytest, sphinx
+pathlib2==2.3.5           # via -r requirements/test.txt, pytest
 pbr==5.4.4                # via -r requirements/base.txt, -r requirements/test.txt, mock, stevedore
 pluggy==0.13.1            # via -r requirements/test.txt, pytest, tox
 psutil==1.2.1             # via -r requirements/base.txt, -r requirements/test.txt, edx-django-utils
@@ -65,7 +66,7 @@ pytz==2019.3              # via -r requirements/base.txt, -r requirements/docs.t
 requests==2.23.0          # via -r requirements/base.txt, -r requirements/docs.txt, -r requirements/test.txt, pyjwkest, sphinx
 rest-condition==1.0.3     # via -r requirements/base.txt, -r requirements/test.txt
 semantic-version==2.8.4   # via -r requirements/base.txt, -r requirements/test.txt
-six==1.14.0               # via -r requirements/base.txt, -r requirements/docs.txt, -r requirements/test.txt, astroid, edx-lint, edx-opaque-keys, httpretty, mock, packaging, pyjwkest, python-dateutil, stevedore, tox, virtualenv
+six==1.14.0               # via -r requirements/base.txt, -r requirements/docs.txt, -r requirements/test.txt, astroid, edx-lint, edx-opaque-keys, httpretty, mock, packaging, pathlib2, pyjwkest, python-dateutil, stevedore, tox, virtualenv
 snowballstemmer==2.0.0    # via -r requirements/docs.txt, sphinx
 sphinx-rtd-theme==0.4.3   # via -r requirements/docs.txt
 sphinx==2.4.4             # via -r requirements/docs.txt, sphinx-rtd-theme
@@ -80,7 +81,7 @@ text-unidecode==1.3       # via -r requirements/test.txt, faker
 tox==2.9.1                # via -r requirements/test.txt
 typed-ast==1.4.1          # via -r requirements/test.txt, astroid
 urllib3==1.25.8           # via -r requirements/base.txt, -r requirements/docs.txt, -r requirements/test.txt, requests
-virtualenv==20.0.9        # via -r requirements/test.txt, tox
+virtualenv==20.0.10       # via -r requirements/test.txt, tox
 wcwidth==0.1.8            # via -r requirements/test.txt, pytest
 wrapt==1.11.2             # via -r requirements/test.txt, astroid
 zipp==1.2.0               # via -r requirements/test.txt, importlib-metadata, importlib-resources

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -15,7 +15,7 @@ coverage==4.5.4           # via -r requirements/test.in, pytest-cov
 ddt==1.3.0                # via -r requirements/test.in
 distlib==0.3.0            # via virtualenv
 django-waffle==0.18.0     # via -c requirements/constraints.txt, -r requirements/base.txt, edx-django-utils
-drf-jwt==1.14.0           # via -c requirements/constraints.txt, -r requirements/base.txt
+drf-jwt==1.15.0           # via -r requirements/base.txt
 edx-django-utils==3.0     # via -r requirements/base.txt
 edx-lint==1.4.1           # via -r requirements/test.in
 edx-opaque-keys==2.0.1    # via -r requirements/base.txt
@@ -34,6 +34,7 @@ mock==1.3.0               # via -r requirements/test.in
 more-itertools==8.2.0     # via pytest
 newrelic==5.10.0.138      # via -r requirements/base.txt, edx-django-utils
 packaging==20.3           # via pytest
+pathlib2==2.3.5           # via pytest
 pbr==5.4.4                # via -r requirements/base.txt, mock, stevedore
 pluggy==0.13.1            # via pytest, tox
 psutil==1.2.1             # via -r requirements/base.txt, edx-django-utils
@@ -56,13 +57,13 @@ pytz==2019.3              # via -r requirements/base.txt, django
 requests==2.23.0          # via -r requirements/base.txt, pyjwkest
 rest-condition==1.0.3     # via -r requirements/base.txt
 semantic-version==2.8.4   # via -r requirements/base.txt
-six==1.14.0               # via -r requirements/base.txt, astroid, edx-lint, edx-opaque-keys, httpretty, mock, packaging, pyjwkest, python-dateutil, stevedore, tox, virtualenv
+six==1.14.0               # via -r requirements/base.txt, astroid, edx-lint, edx-opaque-keys, httpretty, mock, packaging, pathlib2, pyjwkest, python-dateutil, stevedore, tox, virtualenv
 stevedore==1.32.0         # via -r requirements/base.txt, edx-opaque-keys
 text-unidecode==1.3       # via faker
 tox==2.9.1                # via -r requirements/test.in
 typed-ast==1.4.1          # via astroid
 urllib3==1.25.8           # via -r requirements/base.txt, requests
-virtualenv==20.0.9        # via tox
+virtualenv==20.0.10       # via tox
 wcwidth==0.1.8            # via pytest
 wrapt==1.11.2             # via astroid
 zipp==1.2.0               # via importlib-metadata, importlib-resources
diff --git a/test_settings.py b/test_settings.py
@@ -16,6 +16,7 @@
     'edx_rest_framework_extensions',
     'rest_framework_jwt',
     'waffle',
+    'rest_framework_jwt.blacklist',
 )
 
 DATABASES = {