Merge 88bd9ee into fb43f5e

openedx · Sep 29, 2020 · 69d9567 · 69d9567
2 parents fb43f5e + 88bd9ee
commit 69d9567
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -7,15 +7,15 @@
 certifi==2020.6.20        # via requests
 cffi==1.14.3              # via cryptography
 chardet==3.0.4            # via requests
-cryptography==3.1         # via pyjwt
+cryptography==3.1.1       # via pyjwt
 django-model-utils==4.0.0  # via -r requirements/base.in
 django-simple-history==2.11.0  # via -r requirements/base.in
 django-waffle==2.0.0      # via edx-django-utils, edx-drf-extensions
 django==2.2.16            # via -c requirements/constraints.txt, -r requirements/base.in, django-model-utils, djangorestframework, drf-jwt, edx-django-utils, edx-drf-extensions, rest-condition
-djangorestframework==3.11.1  # via -r requirements/base.in, drf-jwt, edx-drf-extensions, rest-condition
+djangorestframework==3.12.1  # via -r requirements/base.in, drf-jwt, edx-drf-extensions, rest-condition
 drf-jwt==1.17.2           # via edx-drf-extensions
 edx-django-utils==3.8.0   # via edx-drf-extensions
-edx-drf-extensions==6.1.2  # via -r requirements/base.in
+edx-drf-extensions==6.2.0  # via -r requirements/base.in
 edx-opaque-keys==2.1.1    # via -r requirements/base.in, edx-drf-extensions
 future==0.18.2            # via pyjwkest
 idna==2.10                # via requests

diff --git a/test-requirements.txt b/test-requirements.txt
@@ -13,16 +13,16 @@ chardet==3.0.4            # via -r requirements/base.txt, requests
 click-log==0.3.2          # via edx-lint
 click==7.1.2              # via click-log, edx-lint
 coverage==5.3             # via -r requirements/test.in, pytest-cov
-cryptography==3.1         # via -r requirements/base.txt, pyjwt
+cryptography==3.1.1       # via -r requirements/base.txt, pyjwt
 ddt==1.4.1                # via -r requirements/test.in
 distlib==0.3.1            # via virtualenv
 django-model-utils==4.0.0  # via -r requirements/base.txt
 django-simple-history==2.11.0  # via -r requirements/base.txt
 django-waffle==2.0.0      # via -r requirements/base.txt, edx-django-utils, edx-drf-extensions
-djangorestframework==3.11.1  # via -r requirements/base.txt, drf-jwt, edx-drf-extensions, rest-condition
+djangorestframework==3.12.1  # via -r requirements/base.txt, drf-jwt, edx-drf-extensions, rest-condition
 drf-jwt==1.17.2           # via -r requirements/base.txt, edx-drf-extensions
 edx-django-utils==3.8.0   # via -r requirements/base.txt, edx-drf-extensions
-edx-drf-extensions==6.1.2  # via -r requirements/base.txt
+edx-drf-extensions==6.2.0  # via -r requirements/base.txt
 edx-lint==1.5.2           # via -r requirements/test.in
 edx-opaque-keys==2.1.1    # via -r requirements/base.txt, edx-drf-extensions
 factory-boy==3.0.1        # via -r requirements/test.in
@@ -37,7 +37,6 @@ iniconfig==1.0.1          # via pytest
 isort==4.3.21             # via pylint
 lazy-object-proxy==1.4.3  # via astroid
 mccabe==0.6.1             # via pylint
-more-itertools==8.5.0     # via pytest
 newrelic==5.20.0.149      # via -r requirements/base.txt, edx-django-utils
 packaging==20.4           # via pytest, tox
 pathlib2==2.3.5           # via pytest
@@ -59,7 +58,7 @@ pymongo==3.11.0           # via -r requirements/base.txt, edx-opaque-keys
 pyparsing==2.4.7          # via packaging
 pytest-cov==2.10.1        # via -r requirements/test.in
 pytest-django==3.10.0     # via -r requirements/test.in
-pytest==6.0.2             # via pytest-cov, pytest-django
+pytest==6.1.0             # via pytest-cov, pytest-django
 python-dateutil==2.8.1    # via -r requirements/base.txt, edx-drf-extensions, faker
 pytz==2020.1              # via -r requirements/base.txt, django
 requests==2.24.0          # via -r requirements/base.txt, edx-drf-extensions, pyjwkest