diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index b263a6ee7b..db041ec460 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -24,25 +24,6 @@ Django<2.3 # See comment. drf-jwt<1.19.1 -# 4.0.0 requires pyjwt[crypto] 2.1.0. See comment. - - -# 7.0.0 requires pyjwt[crypto] 2.1.0. See comment. - - -# PyJWT[crypto] 2.0.0 has a number of breaking changes that we are -# actively working to fix. A number of the active constraints are all related -# to this effort. Additionally, your IDA/service may also be affected directly -# by these changes. You should not upgrade without knowing what you are doing. - - -# 5.0.0+ of social-auth-app-django requires social-auth-core>=4.1.0 -social-auth-app-django<5.0.0 - -# latest version requires PyJWT>=2.0.0 but drf-jwt requires PyJWT[crypto]<2.0.0,>=1.5.2. -# See comment. - - # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process. # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html elasticsearch<7.14.0 diff --git a/requirements/edx-sandbox/py35.txt b/requirements/edx-sandbox/py35.txt index 5db0f43184..b90418fdb3 100644 --- a/requirements/edx-sandbox/py35.txt +++ b/requirements/edx-sandbox/py35.txt @@ -81,7 +81,7 @@ pytz==2021.1 # via matplotlib random2==1.0.1 # via -r requirements/edx-sandbox/py35.in -regex==2021.8.28 +regex==2021.9.24 # via nltk scipy==1.2.1 # via diff --git a/requirements/edx-sandbox/py38.txt b/requirements/edx-sandbox/py38.txt index de07085158..c265815e36 100644 --- a/requirements/edx-sandbox/py38.txt +++ b/requirements/edx-sandbox/py38.txt @@ -71,7 +71,7 @@ python-dateutil==2.4.0 # matplotlib random2==1.0.1 # via -r requirements/edx-sandbox/py38.in -regex==2021.8.28 +regex==2021.9.24 # via nltk scipy==1.7.1 # via diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 1771b8336c..7494e7f820 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -148,7 +148,7 @@ cryptography==3.4.8 # social-auth-core cssutils==2.3.0 # via pynliner -ddt==1.4.2 +ddt==1.4.3 # via # xblock-drag-and-drop-v2 # xblock-poll @@ -226,7 +226,7 @@ django==2.2.24 # rest-condition # super-csv # xss-utils -django-appconf==1.0.4 +django-appconf==1.0.5 # via # -r requirements/edx/base.in # django-statici18n @@ -271,7 +271,7 @@ django-fernet-fields==0.6 # edx-enterprise # edx-event-routing-backends # edxval -django-filter==2.4.0 +django-filter==21.1 # via # -r requirements/edx/base.in # edx-enterprise @@ -303,7 +303,7 @@ django-model-utils==4.1.1 # edxval # ora2 # super-csv -django-mptt==0.13.3 +django-mptt==0.13.4 # via # -r requirements/edx/base.in # django-wiki @@ -323,15 +323,15 @@ django-pyfs==3.1.0 # via -r requirements/edx/base.in django-ratelimit==3.0.1 # via -r requirements/edx/base.in -git+https://github.com/edx/django-ratelimit-backend.git@6e1a0c6ea1d27062c16e9fb94d3c44475146877e#egg=django-ratelimit-backend +django-ratelimit-backend @ git+https://github.com/edx/django-ratelimit-backend.git@6e1a0c6ea1d27062c16e9fb94d3c44475146877e # via -r requirements/edx/github.in -git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12 +django-require @ git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776 # via -r requirements/edx/github.in django-sekizai==2.0.0 # via # -r requirements/edx/base.in # django-wiki -django-ses==2.2.1 +django-ses==2.3.0 # via -r requirements/edx/base.in django-simple-history==3.0.0 # via @@ -444,7 +444,7 @@ edx-drf-extensions==7.0.1 # edx-rbac # edx-when # edxval -edx-enterprise==3.28.19 +edx-enterprise==3.28.20 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in @@ -547,7 +547,7 @@ future==0.18.2 # edx-celeryutils # edx-enterprise # pyjwkest -geoip2==4.3.0 +geoip2==4.4.0 # via -r requirements/edx/base.in glob2==0.7 # via -r requirements/edx/base.in @@ -657,14 +657,14 @@ markupsafe==2.0.1 # jinja2 # mako # xblock -maxminddb==2.1.0 +maxminddb==2.2.0 # via geoip2 mock==4.0.3 # via # -r requirements/edx/paver.txt # xblock-drag-and-drop-v2 # xblock-poll -git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 +mongodbproxy @ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a # via -r requirements/edx/github.in mongoengine==0.23.1 # via -r requirements/edx/base.in @@ -754,7 +754,7 @@ pycountry==20.7.3 # via -r requirements/edx/base.in pycparser==2.20 # via cffi -pycryptodomex==3.10.1 +pycryptodomex==3.10.4 # via # -r requirements/edx/base.in # edx-proctoring @@ -873,7 +873,7 @@ recommender-xblock==2.0.1 # via -r requirements/edx/base.in redis==3.5.3 # via -r requirements/edx/base.in -regex==2021.8.28 +regex==2021.9.24 # via nltk requests==2.26.0 # via @@ -965,15 +965,13 @@ six==1.16.0 # python-dateutil # python-memcached # python-swiftclient - # social-auth-app-django slumber==0.7.1 # via # edx-bulk-grades # edx-enterprise # edx-rest-api-client -social-auth-app-django==4.0.0 +social-auth-app-django==5.0.0 # via - # -c requirements/edx/../common_constraints.txt # -r requirements/edx/base.in # edx-auth-backends social-auth-core==4.1.0 @@ -1091,9 +1089,9 @@ xblock==1.5.1 # xblock-google-drive # xblock-poll # xblock-utils -git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.3.5#egg=xblock-drag-and-drop-v2==2.3.5 +xblock-drag-and-drop-v2 @ git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.3.5 # via -r requirements/edx/github.in -git+https://github.com/open-craft/xblock-poll@922cd36fb1c3cfe00b4ce03b19a13185d136447d#egg=xblock-poll==1.10.2 +xblock-poll @ git+https://github.com/open-craft/xblock-poll@922cd36fb1c3cfe00b4ce03b19a13185d136447d # via -r requirements/edx/github.in xblock-utils==2.2.0 # via diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index a62d7923c2..994906ca77 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -213,7 +213,7 @@ cssutils==2.3.0 # via # -r requirements/edx/testing.txt # pynliner -ddt==1.4.2 +ddt==1.4.3 # via # -r requirements/edx/testing.txt # xblock-drag-and-drop-v2 @@ -303,7 +303,7 @@ django==2.2.24 # rest-condition # super-csv # xss-utils -django-appconf==1.0.4 +django-appconf==1.0.5 # via # -r requirements/edx/testing.txt # django-statici18n @@ -354,7 +354,7 @@ django-fernet-fields==0.6 # edx-enterprise # edx-event-routing-backends # edxval -django-filter==2.4.0 +django-filter==21.1 # via # -r requirements/edx/testing.txt # edx-enterprise @@ -388,7 +388,7 @@ django-model-utils==4.1.1 # edxval # ora2 # super-csv -django-mptt==0.13.3 +django-mptt==0.13.4 # via # -r requirements/edx/testing.txt # django-wiki @@ -412,15 +412,15 @@ django-pyfs==3.1.0 # via -r requirements/edx/testing.txt django-ratelimit==3.0.1 # via -r requirements/edx/testing.txt -git+https://github.com/edx/django-ratelimit-backend.git@6e1a0c6ea1d27062c16e9fb94d3c44475146877e#egg=django-ratelimit-backend +django-ratelimit-backend @ git+https://github.com/edx/django-ratelimit-backend.git@6e1a0c6ea1d27062c16e9fb94d3c44475146877e # via -r requirements/edx/testing.txt -git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12 +django-require @ git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776 # via -r requirements/edx/testing.txt django-sekizai==2.0.0 # via # -r requirements/edx/testing.txt # django-wiki -django-ses==2.2.1 +django-ses==2.3.0 # via -r requirements/edx/testing.txt django-simple-history==3.0.0 # via @@ -544,7 +544,7 @@ edx-drf-extensions==7.0.1 # edx-rbac # edx-when # edxval -edx-enterprise==3.28.19 +edx-enterprise==3.28.20 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt @@ -554,7 +554,7 @@ edx-i18n-tools==0.7.0 # via # -r requirements/edx/testing.txt # ora2 -edx-lint==5.1.0 +edx-lint==5.2.0 # via -r requirements/edx/testing.txt edx-milestones==0.3.2 # via -r requirements/edx/testing.txt @@ -650,7 +650,7 @@ execnet==1.9.0 # pytest-xdist factory-boy==3.2.0 # via -r requirements/edx/testing.txt -faker==8.13.2 +faker==8.14.0 # via # -r requirements/edx/testing.txt # factory-boy @@ -658,7 +658,7 @@ fastapi==0.68.1 # via # -r requirements/edx/testing.txt # pact-python -filelock==3.0.12 +filelock==3.1.0 # via # -r requirements/edx/testing.txt # tox @@ -684,7 +684,7 @@ future==0.18.2 # edx-celeryutils # edx-enterprise # pyjwkest -geoip2==4.3.0 +geoip2==4.4.0 # via -r requirements/edx/testing.txt gitdb==4.0.7 # via @@ -866,7 +866,7 @@ markupsafe==2.0.1 # jinja2 # mako # xblock -maxminddb==2.1.0 +maxminddb==2.2.0 # via # -r requirements/edx/testing.txt # geoip2 @@ -881,7 +881,7 @@ mock==4.0.3 # -r requirements/edx/testing.txt # xblock-drag-and-drop-v2 # xblock-poll -git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 +mongodbproxy @ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a # via -r requirements/edx/testing.txt mongoengine==0.23.1 # via -r requirements/edx/testing.txt @@ -981,7 +981,7 @@ pillow==8.3.2 # edx-organizations pip-tools==6.3.0 # via -r requirements/edx/pip-tools.txt -platformdirs==2.3.0 +platformdirs==2.4.0 # via # -r requirements/edx/testing.txt # virtualenv @@ -1019,7 +1019,7 @@ pycparser==2.20 # via # -r requirements/edx/testing.txt # cffi -pycryptodomex==3.10.1 +pycryptodomex==3.10.4 # via # -r requirements/edx/testing.txt # edx-proctoring @@ -1126,7 +1126,7 @@ pytest-forked==1.3.0 # via # -r requirements/edx/testing.txt # pytest-xdist -pytest-json-report==1.4.0 +pytest-json-report==1.4.1 # via -r requirements/edx/testing.txt pytest-metadata==1.8.0 # via @@ -1215,7 +1215,7 @@ recommender-xblock==2.0.1 # via -r requirements/edx/testing.txt redis==3.5.3 # via -r requirements/edx/testing.txt -regex==2021.8.28 +regex==2021.9.24 # via # -r requirements/edx/testing.txt # nltk @@ -1336,7 +1336,6 @@ six==1.16.0 # python-memcached # python-swiftclient # singledispatch - # social-auth-app-django # sphinxcontrib-httpdomain # tox # transifex-client @@ -1353,9 +1352,8 @@ smmap==4.0.0 # gitdb snowballstemmer==2.1.0 # via sphinx -social-auth-app-django==4.0.0 +social-auth-app-django==5.0.0 # via - # -c requirements/edx/../common_constraints.txt # -r requirements/edx/testing.txt # edx-auth-backends social-auth-core==4.1.0 @@ -1506,7 +1504,7 @@ vine==1.3.0 # -r requirements/edx/testing.txt # amqp # celery -virtualenv==20.8.0 +virtualenv==20.8.1 # via # -r requirements/edx/testing.txt # tox @@ -1565,9 +1563,9 @@ xblock==1.5.1 # xblock-google-drive # xblock-poll # xblock-utils -git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.3.5#egg=xblock-drag-and-drop-v2==2.3.5 +xblock-drag-and-drop-v2 @ git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.3.5 # via -r requirements/edx/testing.txt -git+https://github.com/open-craft/xblock-poll@922cd36fb1c3cfe00b4ce03b19a13185d136447d#egg=xblock-poll==1.10.2 +xblock-poll @ git+https://github.com/open-craft/xblock-poll@922cd36fb1c3cfe00b4ce03b19a13185d136447d # via -r requirements/edx/testing.txt xblock-utils==2.2.0 # via diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 54d745342a..6888014776 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -201,7 +201,7 @@ cssutils==2.3.0 # via # -r requirements/edx/base.txt # pynliner -ddt==1.4.2 +ddt==1.4.3 # via # -r requirements/edx/base.txt # -r requirements/edx/testing.in @@ -288,7 +288,7 @@ distlib==0.3.3 # rest-condition # super-csv # xss-utils -django-appconf==1.0.4 +django-appconf==1.0.5 # via # -r requirements/edx/base.txt # django-statici18n @@ -336,7 +336,7 @@ django-fernet-fields==0.6 # edx-enterprise # edx-event-routing-backends # edxval -django-filter==2.4.0 +django-filter==21.1 # via # -r requirements/edx/base.txt # edx-enterprise @@ -370,7 +370,7 @@ django-model-utils==4.1.1 # edxval # ora2 # super-csv -django-mptt==0.13.3 +django-mptt==0.13.4 # via # -r requirements/edx/base.txt # django-wiki @@ -394,15 +394,15 @@ django-pyfs==3.1.0 # via -r requirements/edx/base.txt django-ratelimit==3.0.1 # via -r requirements/edx/base.txt -git+https://github.com/edx/django-ratelimit-backend.git@6e1a0c6ea1d27062c16e9fb94d3c44475146877e#egg=django-ratelimit-backend +django-ratelimit-backend @ git+https://github.com/edx/django-ratelimit-backend.git@6e1a0c6ea1d27062c16e9fb94d3c44475146877e # via -r requirements/edx/base.txt -git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776#egg=django-require==1.0.12 +django-require @ git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776 # via -r requirements/edx/base.txt django-sekizai==2.0.0 # via # -r requirements/edx/base.txt # django-wiki -django-ses==2.2.1 +django-ses==2.3.0 # via -r requirements/edx/base.txt django-simple-history==3.0.0 # via @@ -524,7 +524,7 @@ edx-drf-extensions==7.0.1 # edx-rbac # edx-when # edxval -edx-enterprise==3.28.19 +edx-enterprise==3.28.20 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt @@ -535,7 +535,7 @@ edx-i18n-tools==0.7.0 # -r requirements/edx/base.txt # -r requirements/edx/testing.in # ora2 -edx-lint==5.1.0 +edx-lint==5.2.0 # via -r requirements/edx/testing.in edx-milestones==0.3.2 # via -r requirements/edx/base.txt @@ -627,11 +627,11 @@ execnet==1.9.0 # via pytest-xdist factory-boy==3.2.0 # via -r requirements/edx/testing.in -faker==8.13.2 +faker==8.14.0 # via factory-boy fastapi==0.68.1 # via pact-python -filelock==3.0.12 +filelock==3.1.0 # via # tox # virtualenv @@ -656,7 +656,7 @@ future==0.18.2 # edx-celeryutils # edx-enterprise # pyjwkest -geoip2==4.3.0 +geoip2==4.4.0 # via -r requirements/edx/base.txt gitdb==4.0.7 # via gitpython @@ -821,7 +821,7 @@ markupsafe==2.0.1 # jinja2 # mako # xblock -maxminddb==2.1.0 +maxminddb==2.2.0 # via # -r requirements/edx/base.txt # geoip2 @@ -832,7 +832,7 @@ mock==4.0.3 # -r requirements/edx/base.txt # xblock-drag-and-drop-v2 # xblock-poll -git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 +mongodbproxy @ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a # via -r requirements/edx/base.txt mongoengine==0.23.1 # via -r requirements/edx/base.txt @@ -921,7 +921,7 @@ pillow==8.3.2 # -r requirements/edx/base.txt # edx-enterprise # edx-organizations -platformdirs==2.3.0 +platformdirs==2.4.0 # via virtualenv pluggy==1.0.0 # via @@ -957,7 +957,7 @@ pycparser==2.20 # via # -r requirements/edx/base.txt # cffi -pycryptodomex==3.10.1 +pycryptodomex==3.10.4 # via # -r requirements/edx/base.txt # edx-proctoring @@ -1052,7 +1052,7 @@ pytest-django==4.4.0 # via -r requirements/edx/testing.in pytest-forked==1.3.0 # via pytest-xdist -pytest-json-report==1.4.0 +pytest-json-report==1.4.1 # via -r requirements/edx/testing.in pytest-metadata==1.8.0 # via @@ -1138,7 +1138,7 @@ recommender-xblock==2.0.1 # via -r requirements/edx/base.txt redis==3.5.3 # via -r requirements/edx/base.txt -regex==2021.8.28 +regex==2021.9.24 # via # -r requirements/edx/base.txt # nltk @@ -1256,7 +1256,6 @@ six==1.16.0 # python-memcached # python-swiftclient # singledispatch - # social-auth-app-django # tox # transifex-client # virtualenv @@ -1268,9 +1267,8 @@ slumber==0.7.1 # edx-rest-api-client smmap==4.0.0 # via gitdb -social-auth-app-django==4.0.0 +social-auth-app-django==5.0.0 # via - # -c requirements/edx/../common_constraints.txt # -r requirements/edx/base.txt # edx-auth-backends social-auth-core==4.1.0 @@ -1389,7 +1387,7 @@ vine==1.3.0 # -r requirements/edx/base.txt # amqp # celery -virtualenv==20.8.0 +virtualenv==20.8.1 # via tox voluptuous==0.12.2 # via @@ -1440,9 +1438,9 @@ xblock==1.5.1 # xblock-google-drive # xblock-poll # xblock-utils -git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.3.5#egg=xblock-drag-and-drop-v2==2.3.5 +xblock-drag-and-drop-v2 @ git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.3.5 # via -r requirements/edx/base.txt -git+https://github.com/open-craft/xblock-poll@922cd36fb1c3cfe00b4ce03b19a13185d136447d#egg=xblock-poll==1.10.2 +xblock-poll @ git+https://github.com/open-craft/xblock-poll@922cd36fb1c3cfe00b4ce03b19a13185d136447d # via -r requirements/edx/base.txt xblock-utils==2.2.0 # via