diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 2d7fdaa7d1..48a17de401 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -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 diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 11fd17f815..321756cef3 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -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 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index b6b5a75702..805a17b2f8 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -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 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 5f8bcfc924..3d5844698c 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -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 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index b8230195cd..b40a92de4c 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -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