From 3c1140dc49c74353eda99c215c37d543ad6e6eb1 Mon Sep 17 00:00:00 2001
From: Ayub-khan <muhammadayubkhan6@gmail.com>
Date: Mon, 2 Mar 2020 15:42:52 +0500
Subject: [PATCH] BOM-1045 -Upgrade edx-drf-extensions -settings-update
---
cms/envs/common.py | 1 +
lms/envs/common.py | 2 ++
openedx/tests/settings.py | 1 +
pavelib/prereqs.py | 1 +
requirements/constraints.txt | 4 ++--
requirements/edx/base.in | 3 +--
requirements/edx/base.txt | 18 +++++++++---------
requirements/edx/development.txt | 18 +++++++++---------
requirements/edx/django.txt | 2 +-
requirements/edx/pip-tools.txt | 2 +-
requirements/edx/testing.txt | 16 ++++++++--------
11 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 9508c774127..0d92dce489f 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -1430,6 +1430,7 @@ INSTALLED_APPS = [
# Management of per-user schedules
'openedx.core.djangoapps.schedules',
+ 'rest_framework_jwt',
]
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 071672918fe..8053ee8ee0a 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -2493,6 +2493,7 @@ INSTALLED_APPS = [
# Management of per-user schedules
'openedx.core.djangoapps.schedules',
+ 'rest_framework_jwt',
]
######################### CSRF #########################################
@@ -3426,6 +3427,7 @@ JWT_AUTH = {
],
'JWT_AUTH_COOKIE_HEADER_PAYLOAD': 'edx-jwt-cookie-header-payload',
'JWT_AUTH_COOKIE_SIGNATURE': 'edx-jwt-cookie-signature',
+ 'JWT_AUTH_HEADER_PREFIX': 'JWT',
}
EDX_DRF_EXTENSIONS = {
diff --git a/openedx/tests/settings.py b/openedx/tests/settings.py
index 94186cdea96..642ec381a98 100644
--- a/openedx/tests/settings.py
+++ b/openedx/tests/settings.py
@@ -94,6 +94,7 @@ INSTALLED_APPS = (
'celery_utils',
'waffle',
'edx_when',
+ 'rest_framework_jwt',
# Django 1.11 demands to have imported models supported by installed apps.
'completion',
diff --git a/pavelib/prereqs.py b/pavelib/prereqs.py
index 5141456c321..8b5cb5fb6f4 100644
--- a/pavelib/prereqs.py
+++ b/pavelib/prereqs.py
@@ -205,6 +205,7 @@ PACKAGES_TO_UNINSTALL = [
"python-saml", # Because python3-saml shares the same directory name
"pdfminer", # Replaced by pdfminer.six, which shares the same directory name
"pytest-faulthandler", # Because it was bundled into pytest
+ "djangorestframework-jwt", # Because now its called drf-jwt.
]
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 4c5611f48b4..d2b75510fd7 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -28,8 +28,8 @@ django-storages<1.9
# Support was dropped for Python 3.5, Django 2.0, Django 2.1, DRF 3.7
drf-yasg<1.17.1
-# 4.0.1 introduced a breaking change involving drf and jwt
-edx-drf-extensions==4.0.0
+# Not properly supporting latest changing of drf-jwt
+drf-jwt==1.14.0
# Upgrading to 2.12.0 breaks several test classes due to API changes, need to update our code accordingly
factory-boy==2.8.1
diff --git a/requirements/edx/base.in b/requirements/edx/base.in
index 87b081d1ab3..8a168564634 100644
--- a/requirements/edx/base.in
+++ b/requirements/edx/base.in
@@ -64,7 +64,6 @@ django-user-tasks
django-waffle==0.18.0
django-webpack-loader # Used to wire webpack bundles into the django asset pipeline
djangorestframework==3.9.4
-djangorestframework-jwt
edx-ace
edx-analytics-data-api-client
edx-api-doc-tools
@@ -115,7 +114,7 @@ PyContracts
pycountry
pycryptodomex
pygments # Used to support colors in paver command output
-pyjwkest==1.3.2
+pyjwkest
# TODO Replace PyJWT usage with pyjwkest
PyJWT==1.5.2
pymongo # MongoDB driver
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index bd17fe7c3fa..42b27c2d6bb 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -41,7 +41,7 @@ certifi==2019.11.28 # via -r requirements/edx/paver.txt, requests
cffi==1.14.0 # via -r requirements/edx/../edx-sandbox/shared.txt, cryptography
chardet==3.0.4 # via -r requirements/edx/paver.txt, pdfminer.six, pysrt, requests
git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 # via -r requirements/edx/github.in
-click==7.1 # via code-annotations, user-util
+click==7.1.1 # via code-annotations, user-util
code-annotations==0.3.3 # via edx-enterprise
contextlib2==0.6.0.post1 # via -r requirements/edx/base.in
coreapi==2.3.3 # via drf-yasg
@@ -49,7 +49,7 @@ coreschema==0.0.4 # via coreapi, drf-yasg
git+https://github.com/edx/crowdsourcehinter.git@a7ffc85b134b7d8909bf1fefd23dbdb8eb28e467#egg=crowdsourcehinter-xblock==0.2 # via -r requirements/edx/github.in
cryptography==2.8 # via -r requirements/edx/../edx-sandbox/shared.txt, django-fernet-fields, edx-enterprise
cssutils==1.0.2 # via pynliner
-ddt==1.2.2 # via xblock-drag-and-drop-v2, xblock-poll
+ddt==1.3.0 # via xblock-drag-and-drop-v2, xblock-poll
decorator==4.4.2 # via pycontracts
defusedxml==0.5.0 # via -r requirements/edx/base.in, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core
git+https://github.com/django-compressor/django-appconf@1526a842ee084b791aa66c931b3822091a442853#egg=django-appconf # via -r requirements/edx/github.in, django-statici18n
@@ -85,12 +85,12 @@ django-storages==1.8 # via -c requirements/edx/../constraints.txt, -r requi
django-user-tasks==0.3.0 # via -r requirements/edx/base.in
django-waffle==0.18.0 # via -r requirements/edx/base.in, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-proctoring
django-webpack-loader==0.7.0 # via -r requirements/edx/base.in, edx-proctoring
-django==1.11.29 # via -r requirements/edx/base.in, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils
-djangorestframework-jwt==1.11.0 # via -r requirements/edx/base.in, edx-drf-extensions
+django==1.11.29 # via -r requirements/edx/base.in, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-jwt, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils
djangorestframework-xml==1.4.0 # via edx-enterprise
-djangorestframework==3.9.4 # via -r requirements/edx/base.in, django-config-models, django-user-tasks, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv
+djangorestframework==3.9.4 # via -r requirements/edx/base.in, django-config-models, django-user-tasks, drf-jwt, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv
docopt==0.6.2 # via xmodule
docutils==0.16 # via botocore
+drf-jwt==1.14.0 # via -c requirements/edx/../constraints.txt, edx-drf-extensions
drf-yasg==1.17.0 # via -c requirements/edx/../constraints.txt, edx-api-doc-tools
edx-ace==0.1.13 # via -r requirements/edx/base.in
edx-analytics-data-api-client==0.15.3 # via -r requirements/edx/base.in
@@ -102,7 +102,7 @@ edx-completion==3.1.1 # via -r requirements/edx/base.in
edx-django-release-util==0.3.6 # via -r requirements/edx/base.in
edx-django-sites-extensions==2.4.3 # via -r requirements/edx/base.in
edx-django-utils==3.0 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client
-edx-drf-extensions==4.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
+edx-drf-extensions==4.0.1 # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
edx-enterprise==2.5.1 # via -r requirements/edx/base.in
edx-i18n-tools==0.5.0 # via ora2
edx-milestones==0.2.6 # via -r requirements/edx/base.in
@@ -161,7 +161,7 @@ mongoengine==0.10.0 # via -r requirements/edx/base.in
more-itertools==8.2.0 # via -r requirements/edx/paver.txt, zipp
mpmath==1.1.0 # via sympy
mysqlclient==1.4.6 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
-newrelic==5.8.0.136 # via -r requirements/edx/base.in, edx-django-utils
+newrelic==5.10.0.138 # via -r requirements/edx/base.in, edx-django-utils
nltk==3.4.5 # via -r requirements/edx/../edx-sandbox/shared.txt, chem
nodeenv==1.3.5 # via -r requirements/edx/base.in
numpy==1.18.1 # via calc, chem, scipy
@@ -187,8 +187,8 @@ pycparser==2.20 # via -r requirements/edx/../edx-sandbox/shared.txt, c
pycryptodome==3.9.7 # via pdfminer.six
pycryptodomex==3.9.7 # via -r requirements/edx/base.in, edx-proctoring, pyjwkest
pygments==2.6.1 # via -r requirements/edx/base.in
-pyjwkest==1.3.2 # via -r requirements/edx/base.in, edx-drf-extensions
-pyjwt==1.5.2 # via -r requirements/edx/base.in, djangorestframework-jwt, edx-rest-api-client, social-auth-core
+pyjwkest==1.4.2 # via -r requirements/edx/base.in, edx-drf-extensions
+pyjwt==1.5.2 # via -r requirements/edx/base.in, drf-jwt, edx-rest-api-client, social-auth-core
pymongo==3.9.0 # via -r requirements/edx/base.in, -r requirements/edx/paver.txt, edx-opaque-keys, event-tracking, mongodbproxy, mongoengine
pynliner==0.8.0 # via -r requirements/edx/base.in
pyparsing==2.2.0 # via calc, chem, packaging, pycontracts
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 64186f766ca..b949bf74fb8 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -46,7 +46,7 @@ cffi==1.14.0 # via -r requirements/edx/testing.txt, cryptography
chardet==3.0.4 # via -r requirements/edx/testing.txt, pdfminer.six, pysrt, requests
git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 # via -r requirements/edx/testing.txt
click-log==0.3.2 # via -r requirements/edx/testing.txt, edx-lint
-click==7.1 # via -r requirements/edx/development.in, -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, click-log, code-annotations, edx-lint, pip-tools, user-util
+click==7.1.1 # via -r requirements/edx/development.in, -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, click-log, code-annotations, edx-lint, pip-tools, user-util
code-annotations==0.3.3 # via -r requirements/edx/testing.txt, edx-enterprise
colorama==0.4.1 # via -r requirements/edx/testing.txt, radon
contextlib2==0.6.0.post1 # via -r requirements/edx/testing.txt
@@ -58,7 +58,7 @@ git+https://github.com/edx/crowdsourcehinter.git@a7ffc85b134b7d8909bf1fefd23dbdb
cryptography==2.8 # via -r requirements/edx/testing.txt, django-fernet-fields, edx-enterprise
cssselect==1.1.0 # via -r requirements/edx/testing.txt, pyquery
cssutils==1.0.2 # via -r requirements/edx/testing.txt, pynliner
-ddt==1.2.2 # via -r requirements/edx/testing.txt, xblock-drag-and-drop-v2, xblock-poll
+ddt==1.3.0 # via -r requirements/edx/testing.txt, xblock-drag-and-drop-v2, xblock-poll
decorator==4.4.2 # via -r requirements/edx/testing.txt, pycontracts
defusedxml==0.5.0 # via -r requirements/edx/testing.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core
diff-cover==2.6.0 # via -r requirements/edx/testing.txt
@@ -97,12 +97,12 @@ django-storages==1.8 # via -c requirements/edx/../constraints.txt, -r requi
django-user-tasks==0.3.0 # via -r requirements/edx/testing.txt
django-waffle==0.18.0 # via -r requirements/edx/testing.txt, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-proctoring
django-webpack-loader==0.7.0 # via -r requirements/edx/testing.txt, edx-proctoring
-django==1.11.29 # via -r requirements/edx/testing.txt, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-debug-toolbar, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils
-djangorestframework-jwt==1.11.0 # via -r requirements/edx/testing.txt, edx-drf-extensions
+django==1.11.29 # via -r requirements/edx/testing.txt, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-debug-toolbar, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-jwt, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils
djangorestframework-xml==1.4.0 # via -r requirements/edx/testing.txt, edx-enterprise
-djangorestframework==3.9.4 # via -r requirements/edx/testing.txt, django-config-models, django-user-tasks, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv
+djangorestframework==3.9.4 # via -r requirements/edx/testing.txt, django-config-models, django-user-tasks, drf-jwt, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv
docopt==0.6.2 # via -r requirements/edx/testing.txt, xmodule
docutils==0.16 # via -r requirements/edx/testing.txt, botocore, m2r, sphinx
+drf-jwt==1.14.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-drf-extensions
drf-yasg==1.17.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-api-doc-tools
edx-ace==0.1.13 # via -r requirements/edx/testing.txt
edx-analytics-data-api-client==0.15.3 # via -r requirements/edx/testing.txt
@@ -114,7 +114,7 @@ edx-completion==3.1.1 # via -r requirements/edx/testing.txt
edx-django-release-util==0.3.6 # via -r requirements/edx/testing.txt
edx-django-sites-extensions==2.4.3 # via -r requirements/edx/testing.txt
edx-django-utils==3.0 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client
-edx-drf-extensions==4.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
+edx-drf-extensions==4.0.1 # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
edx-enterprise==2.5.1 # via -r requirements/edx/testing.txt
edx-i18n-tools==0.5.0 # via -r requirements/edx/testing.txt, ora2
edx-lint==1.4.1 # via -r requirements/edx/testing.txt
@@ -195,7 +195,7 @@ mongoengine==0.10.0 # via -r requirements/edx/testing.txt
more-itertools==8.2.0 # via -r requirements/edx/testing.txt, pytest, zipp
mpmath==1.1.0 # via -r requirements/edx/testing.txt, sympy
mysqlclient==1.4.6 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
-newrelic==5.8.0.136 # via -r requirements/edx/testing.txt, edx-django-utils
+newrelic==5.10.0.138 # via -r requirements/edx/testing.txt, edx-django-utils
nltk==3.4.5 # via -r requirements/edx/testing.txt, chem
nodeenv==1.3.5 # via -r requirements/edx/testing.txt
numpy==1.18.1 # via -r requirements/edx/testing.txt, calc, chem, pandas, scipy
@@ -229,8 +229,8 @@ pycryptodomex==3.9.7 # via -r requirements/edx/testing.txt, edx-proctoring,
pyflakes==2.1.1 # via -r requirements/edx/testing.txt, flake8
pygments==2.6.1 # via -r requirements/edx/testing.txt, diff-cover, sphinx
pyinotify==0.9.6 # via -r requirements/edx/development.in
-pyjwkest==1.3.2 # via -r requirements/edx/testing.txt, edx-drf-extensions
-pyjwt==1.5.2 # via -r requirements/edx/testing.txt, djangorestframework-jwt, edx-rest-api-client, social-auth-core
+pyjwkest==1.4.2 # via -r requirements/edx/testing.txt, edx-drf-extensions
+pyjwt==1.5.2 # via -r requirements/edx/testing.txt, drf-jwt, edx-rest-api-client, social-auth-core
pylint-celery==0.3 # via -r requirements/edx/testing.txt, edx-lint
pylint-django==2.0.11 # via -r requirements/edx/testing.txt, edx-lint
pylint-plugin-utils==0.6 # via -r requirements/edx/testing.txt, pylint-celery, pylint-django
diff --git a/requirements/edx/django.txt b/requirements/edx/django.txt
index b43e496c53c..baa89144605 100644
--- a/requirements/edx/django.txt
+++ b/requirements/edx/django.txt
@@ -1,2 +1,2 @@
django-oauth-toolkit==1.1.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
-django==1.11.29 # via -r requirements/edx/base.in, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils
+django==1.11.29 # via -r requirements/edx/base.in, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-jwt, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils
diff --git a/requirements/edx/pip-tools.txt b/requirements/edx/pip-tools.txt
index 77aa65ab25a..c4b08ccc7d7 100644
--- a/requirements/edx/pip-tools.txt
+++ b/requirements/edx/pip-tools.txt
@@ -4,6 +4,6 @@
#
# make upgrade
#
-click==7.1 # via pip-tools
+click==7.1.1 # via pip-tools
pip-tools==4.5.1 # via -r requirements/edx/pip-tools.in
six==1.14.0 # via -r requirements/edx/pip-tools.in, pip-tools
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 34dab92362c..7751636ee3b 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -45,7 +45,7 @@ cffi==1.14.0 # via -r requirements/edx/base.txt, cryptography
chardet==3.0.4 # via -r requirements/edx/base.txt, pdfminer.six, pysrt, requests
git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 # via -r requirements/edx/base.txt
click-log==0.3.2 # via edx-lint
-click==7.1 # via -r requirements/edx/base.txt, click-log, code-annotations, edx-lint, user-util
+click==7.1.1 # via -r requirements/edx/base.txt, click-log, code-annotations, edx-lint, user-util
code-annotations==0.3.3 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, edx-enterprise
colorama==0.4.1 # via radon
contextlib2==0.6.0.post1 # via -r requirements/edx/base.txt
@@ -57,7 +57,7 @@ git+https://github.com/edx/crowdsourcehinter.git@a7ffc85b134b7d8909bf1fefd23dbdb
cryptography==2.8 # via -r requirements/edx/base.txt, django-fernet-fields, edx-enterprise
cssselect==1.1.0 # via -r requirements/edx/testing.in, pyquery
cssutils==1.0.2 # via -r requirements/edx/base.txt, pynliner
-ddt==1.2.2 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, xblock-drag-and-drop-v2, xblock-poll
+ddt==1.3.0 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, xblock-drag-and-drop-v2, xblock-poll
decorator==4.4.2 # via -r requirements/edx/base.txt, pycontracts
defusedxml==0.5.0 # via -r requirements/edx/base.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core
diff-cover==2.6.0 # via -r requirements/edx/coverage.txt
@@ -94,11 +94,11 @@ django-storages==1.8 # via -c requirements/edx/../constraints.txt, -r requi
django-user-tasks==0.3.0 # via -r requirements/edx/base.txt
django-waffle==0.18.0 # via -r requirements/edx/base.txt, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-proctoring
django-webpack-loader==0.7.0 # via -r requirements/edx/base.txt, edx-proctoring
-djangorestframework-jwt==1.11.0 # via -r requirements/edx/base.txt, edx-drf-extensions
djangorestframework-xml==1.4.0 # via -r requirements/edx/base.txt, edx-enterprise
-djangorestframework==3.9.4 # via -r requirements/edx/base.txt, django-config-models, django-user-tasks, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv
+djangorestframework==3.9.4 # via -r requirements/edx/base.txt, django-config-models, django-user-tasks, drf-jwt, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv
docopt==0.6.2 # via -r requirements/edx/base.txt, xmodule
docutils==0.16 # via -r requirements/edx/base.txt, botocore
+drf-jwt==1.14.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-drf-extensions
drf-yasg==1.17.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-api-doc-tools
edx-ace==0.1.13 # via -r requirements/edx/base.txt
edx-analytics-data-api-client==0.15.3 # via -r requirements/edx/base.txt
@@ -110,7 +110,7 @@ edx-completion==3.1.1 # via -r requirements/edx/base.txt
edx-django-release-util==0.3.6 # via -r requirements/edx/base.txt
edx-django-sites-extensions==2.4.3 # via -r requirements/edx/base.txt
edx-django-utils==3.0 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client
-edx-drf-extensions==4.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
+edx-drf-extensions==4.0.1 # via -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
edx-enterprise==2.5.1 # via -r requirements/edx/base.txt
edx-i18n-tools==0.5.0 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, ora2
edx-lint==1.4.1 # via -r requirements/edx/testing.in
@@ -186,7 +186,7 @@ mongoengine==0.10.0 # via -r requirements/edx/base.txt
more-itertools==8.2.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, pytest, zipp
mpmath==1.1.0 # via -r requirements/edx/base.txt, sympy
mysqlclient==1.4.6 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
-newrelic==5.8.0.136 # via -r requirements/edx/base.txt, edx-django-utils
+newrelic==5.10.0.138 # via -r requirements/edx/base.txt, edx-django-utils
nltk==3.4.5 # via -r requirements/edx/base.txt, chem
nodeenv==1.3.5 # via -r requirements/edx/base.txt
numpy==1.18.1 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, calc, chem, pandas, scipy
@@ -218,8 +218,8 @@ pycryptodome==3.9.7 # via -r requirements/edx/base.txt, pdfminer.six
pycryptodomex==3.9.7 # via -r requirements/edx/base.txt, edx-proctoring, pyjwkest
pyflakes==2.1.1 # via flake8
pygments==2.6.1 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, diff-cover
-pyjwkest==1.3.2 # via -r requirements/edx/base.txt, edx-drf-extensions
-pyjwt==1.5.2 # via -r requirements/edx/base.txt, djangorestframework-jwt, edx-rest-api-client, social-auth-core
+pyjwkest==1.4.2 # via -r requirements/edx/base.txt, edx-drf-extensions
+pyjwt==1.5.2 # via -r requirements/edx/base.txt, drf-jwt, edx-rest-api-client, social-auth-core
pylint-celery==0.3 # via edx-lint
pylint-django==2.0.11 # via edx-lint
pylint-plugin-utils==0.6 # via pylint-celery, pylint-django
--
GitLab