Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unpin PyJWT to unblock use of Apple auth backend (ARCHBOM-1281) (#24375)

Browse Source 
...and pin django-ipware for the moment
This commit is contained in:
Tim McCormack
2020-07-01 13:55:34 -04:00
committed by GitHub
parent fba65965f2
commit bba346cb7f
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
requirements/constraints.txt
View File

@@ -22,6 +22,9 @@ django-cors-headers<3.0.0
# It seems like django-countries > 5.5 may cause performance issues for us.
django-countries==5.5
# Removes deprecated get_ip function, which we still use (ARCHBOM-1329 for unpinning)
django-ipware<3.0.0
# 2.0.0 dropped support for Python 3.5
django-pipeline<2.0.0

3
requirements/edx/base.in
View File

@@ -125,7 +125,8 @@ pycryptodomex
pygments # Used to support colors in paver command output
pyjwkest
# TODO Replace PyJWT usage with pyjwkest
PyJWT==1.5.2
# PyJWT 1.6.3 contains PyJWTError, which is required by Apple auth in social-auth-core
PyJWT>=1.6.3
pymongo # MongoDB driver
pynliner # Inlines CSS styles into HTML for email notifications
python-dateutil

4
requirements/edx/base.txt
View File

@@ -59,7 +59,7 @@ django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requi
django-crum==0.7.6 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring, edx-rbac, super-csv
django-fernet-fields==0.6 # via -r requirements/edx/base.in, edx-enterprise, edxval
django-filter==2.3.0 # via -r requirements/edx/base.in, edx-enterprise
django-ipware==2.1.0 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring
django-ipware==2.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, edx-enterprise, edx-proctoring
django-js-asset==1.2.2 # via django-mptt
django-method-override==1.0.4 # via -r requirements/edx/base.in
django-model-utils==4.0.0 # via -r requirements/edx/base.in, django-user-tasks, edx-bulk-grades, edx-celeryutils, edx-completion, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-rbac, edx-submissions, edx-when, edxval, ora2, super-csv
@@ -185,7 +185,7 @@ pycryptodome==3.9.8 # via lti-consumer-xblock, pdfminer.six
pycryptodomex==3.9.8 # via -r requirements/edx/base.in, edx-proctoring, pyjwkest
pygments==2.6.1 # via -r requirements/edx/base.in
pyjwkest==1.4.2 # via -r requirements/edx/base.in, edx-drf-extensions, lti-consumer-xblock
pyjwt==1.5.2 # via -r requirements/edx/base.in, drf-jwt, edx-rest-api-client, social-auth-core
pyjwt==1.7.1 # via -r requirements/edx/base.in, drf-jwt, edx-rest-api-client, social-auth-core
pymongo==3.10.1 # 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.4.7 # via chem, openedx-calc, packaging, pycontracts

4
requirements/edx/development.txt
View File

@@ -71,7 +71,7 @@ django-crum==0.7.6 # via -r requirements/edx/testing.txt, edx-enterprise,
django-debug-toolbar==2.2 # via -r requirements/edx/development.in
django-fernet-fields==0.6 # via -r requirements/edx/testing.txt, edx-enterprise, edxval
django-filter==2.3.0 # via -r requirements/edx/testing.txt, edx-enterprise
django-ipware==2.1.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring
django-ipware==2.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring
django-js-asset==1.2.2 # via -r requirements/edx/testing.txt, django-mptt
django-method-override==1.0.4 # via -r requirements/edx/testing.txt
django-model-utils==4.0.0 # via -r requirements/edx/testing.txt, django-user-tasks, edx-bulk-grades, edx-celeryutils, edx-completion, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-rbac, edx-submissions, edx-when, edxval, ora2, super-csv
@@ -226,7 +226,7 @@ pycryptodomex==3.9.8 # via -r requirements/edx/testing.txt, edx-proctoring,
pyflakes==2.2.0 # via -r requirements/edx/testing.txt, flake8
pygments==2.6.1 # via -r requirements/edx/testing.txt, diff-cover, sphinx
pyjwkest==1.4.2 # via -r requirements/edx/testing.txt, edx-drf-extensions, lti-consumer-xblock
pyjwt==1.5.2 # via -r requirements/edx/testing.txt, drf-jwt, edx-rest-api-client, social-auth-core
pyjwt==1.7.1 # 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

4
requirements/edx/testing.txt
View File

@@ -69,7 +69,7 @@ django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requi
django-crum==0.7.6 # via -r requirements/edx/base.txt, edx-enterprise, edx-proctoring, edx-rbac, super-csv
django-fernet-fields==0.6 # via -r requirements/edx/base.txt, edx-enterprise, edxval
django-filter==2.3.0 # via -r requirements/edx/base.txt, edx-enterprise
django-ipware==2.1.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-proctoring
django-ipware==2.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-enterprise, edx-proctoring
django-js-asset==1.2.2 # via -r requirements/edx/base.txt, django-mptt
django-method-override==1.0.4 # via -r requirements/edx/base.txt
django-model-utils==4.0.0 # via -r requirements/edx/base.txt, django-user-tasks, edx-bulk-grades, edx-celeryutils, edx-completion, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-rbac, edx-submissions, edx-when, edxval, ora2, super-csv
@@ -217,7 +217,7 @@ pycryptodomex==3.9.8 # via -r requirements/edx/base.txt, edx-proctoring, py
pyflakes==2.2.0 # via flake8
pygments==2.6.1 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, diff-cover
pyjwkest==1.4.2 # via -r requirements/edx/base.txt, edx-drf-extensions, lti-consumer-xblock
pyjwt==1.5.2 # via -r requirements/edx/base.txt, drf-jwt, edx-rest-api-client, social-auth-core
pyjwt==1.7.1 # 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