From 623021112a114655485789a441f015dcfdc3687c Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 30 Jan 2023 11:27:27 -0500 Subject: [PATCH] chore: Run `make upgrade` --- requirements/common_constraints.txt | 2 -- requirements/edx/base.txt | 34 ++++++++++--------- requirements/edx/coverage.txt | 4 +-- requirements/edx/development.txt | 51 ++++++++++++++++------------- requirements/edx/doc.txt | 4 +-- requirements/edx/pip.txt | 2 +- requirements/edx/testing.txt | 49 +++++++++++++++------------ 7 files changed, 81 insertions(+), 65 deletions(-) diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 8c4cd9672f..a9878ac2ec 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -24,8 +24,6 @@ Django<4.0 # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html elasticsearch<7.14.0 - - # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected django-simple-history==3.0.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index a8b30efc53..90b965f8fc 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -60,6 +60,7 @@ billiard==3.6.4.0 # via celery bleach[css]==5.0.1 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in # edx-enterprise # lti-consumer-xblock @@ -195,7 +196,6 @@ django==3.2.16 # django-multi-email-field # django-mysql # django-oauth-toolkit - # django-pyfs # django-sekizai # django-ses # django-splash @@ -236,6 +236,7 @@ django==3.2.16 # jsonfield # learner-pathway-progress # lti-consumer-xblock + # openedx-django-pyfs # openedx-django-wiki # openedx-events # openedx-filters @@ -330,9 +331,7 @@ django-oauth-toolkit==1.3.2 # -r requirements/edx/base.in django-object-actions==4.1.0 # via edx-enterprise -django-pipeline==2.0.8 - # via -r requirements/edx/base.in -django-pyfs==3.2.0 +django-pipeline==2.0.9 # via -r requirements/edx/base.in django-ratelimit==4.0.0 # via -r requirements/edx/base.in @@ -481,7 +480,7 @@ edx-enterprise==3.60.15 # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in # learner-pathway-progress -edx-event-bus-kafka==3.6.1 +edx-event-bus-kafka==3.6.3 # via -r requirements/edx/base.in edx-i18n-tools==0.9.2 # via ora2 @@ -563,7 +562,7 @@ event-tracking==2.1.0 # -r requirements/edx/base.in # edx-proctoring # edx-search -fastavro==1.7.0 +fastavro==1.7.1 # via openedx-events filelock==3.9.0 # via snowflake-connector-python @@ -574,13 +573,13 @@ frozenlist==1.3.3 fs==2.0.27 # via # -r requirements/edx/base.in - # django-pyfs # fs-s3fs + # openedx-django-pyfs # xblock fs-s3fs==0.1.8 # via # -r requirements/edx/base.in - # django-pyfs + # openedx-django-pyfs future==0.18.3 # via pyjwkest geoip2==4.6.0 @@ -655,6 +654,7 @@ lazy==1.5 # acid-xblock # lti-consumer-xblock # ora2 + # xblock learner-pathway-progress==1.3.3 # via -r requirements/edx/base.in levenshtein==0.20.9 @@ -666,7 +666,9 @@ libsass==0.10.0 loremipsum==1.0.5 # via ora2 lti-consumer-xblock==7.2.3 - # via -r requirements/edx/base.in + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/base.in lxml==4.9.2 # via # -r requirements/edx/base.in @@ -753,9 +755,11 @@ oauthlib==3.0.1 # social-auth-core openedx-calc==3.0.1 # via -r requirements/edx/base.in +openedx-django-pyfs==3.2.1 + # via xblock openedx-django-wiki==1.1.4 # via -r requirements/edx/base.in -openedx-events==4.1.1 +openedx-events==4.2.0 # via # -r requirements/edx/base.in # edx-event-bus-kafka @@ -825,7 +829,7 @@ pycountry==22.3.5 # via -r requirements/edx/base.in pycparser==2.21 # via cffi -pycryptodomex==3.16.0 +pycryptodomex==3.17 # via # -r requirements/edx/base.in # edx-proctoring @@ -903,7 +907,7 @@ python-levenshtein==0.20.9 # via -r requirements/edx/base.in python-memcached==1.59 # via -r requirements/edx/paver.txt -python-slugify==7.0.0 +python-slugify==8.0.0 # via code-annotations python-swiftclient==4.1.0 # via ora2 @@ -1004,7 +1008,7 @@ scipy==1.7.3 # openedx-calc semantic-version==2.10.0 # via edx-drf-extensions -shapely==2.0.0 +shapely==2.0.1 # via -r requirements/edx/base.in simplejson==3.18.1 # via @@ -1153,7 +1157,7 @@ wrapt==1.14.1 # via # -r requirements/edx/paver.txt # deprecated -xblock==1.6.1 +xblock[django]==1.6.2 # via # -r requirements/edx/base.in # acid-xblock @@ -1190,7 +1194,7 @@ xss-utils==0.4.0 # via -r requirements/edx/base.in yarl==1.8.2 # via aiohttp -zipp==3.11.0 +zipp==3.12.0 # via # importlib-metadata # importlib-resources diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index 1515f74f99..160453ccd9 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -6,9 +6,9 @@ # chardet==5.1.0 # via diff-cover -coverage==7.0.5 +coverage==7.1.0 # via -r requirements/edx/coverage.in -diff-cover==7.3.2 +diff-cover==7.4.0 # via -r requirements/edx/coverage.in jinja2==3.1.2 # via diff-cover diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 6f7284ff3b..113f16ef96 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -95,6 +95,7 @@ billiard==3.6.4.0 # celery bleach[css]==5.0.1 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # edx-enterprise # lti-consumer-xblock @@ -216,7 +217,7 @@ coreschema==0.0.4 # -r requirements/edx/testing.txt # coreapi # drf-yasg -coverage[toml]==7.0.5 +coverage[toml]==7.1.0 # via # -r requirements/edx/testing.txt # pytest-cov @@ -262,7 +263,7 @@ deprecated==1.2.13 # via # -r requirements/edx/testing.txt # jwcrypto -diff-cover==7.3.2 +diff-cover==7.4.0 # via -r requirements/edx/testing.txt dill==0.3.6 # via @@ -291,7 +292,6 @@ django==3.2.16 # django-multi-email-field # django-mysql # django-oauth-toolkit - # django-pyfs # django-sekizai # django-ses # django-splash @@ -332,6 +332,7 @@ django==3.2.16 # jsonfield # learner-pathway-progress # lti-consumer-xblock + # openedx-django-pyfs # openedx-django-wiki # openedx-events # openedx-filters @@ -440,9 +441,7 @@ django-object-actions==4.1.0 # via # -r requirements/edx/testing.txt # edx-enterprise -django-pipeline==2.0.8 - # via -r requirements/edx/testing.txt -django-pyfs==3.2.0 +django-pipeline==2.0.9 # via -r requirements/edx/testing.txt django-ratelimit==4.0.0 # via -r requirements/edx/testing.txt @@ -605,7 +604,7 @@ edx-enterprise==3.60.15 # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # learner-pathway-progress -edx-event-bus-kafka==3.6.1 +edx-event-bus-kafka==3.6.3 # via -r requirements/edx/testing.txt edx-i18n-tools==0.9.2 # via @@ -709,7 +708,7 @@ execnet==1.9.0 # pytest-xdist factory-boy==3.2.1 # via -r requirements/edx/testing.txt -faker==16.6.0 +faker==16.6.1 # via # -r requirements/edx/testing.txt # factory-boy @@ -717,7 +716,7 @@ fastapi==0.89.1 # via # -r requirements/edx/testing.txt # pact-python -fastavro==1.7.0 +fastavro==1.7.1 # via # -r requirements/edx/testing.txt # openedx-events @@ -737,13 +736,13 @@ frozenlist==1.3.3 fs==2.0.27 # via # -r requirements/edx/testing.txt - # django-pyfs # fs-s3fs + # openedx-django-pyfs # xblock fs-s3fs==0.1.8 # via # -r requirements/edx/testing.txt - # django-pyfs + # openedx-django-pyfs future==0.18.3 # via # -r requirements/edx/testing.txt @@ -782,7 +781,7 @@ idna==3.4 # yarl imagesize==1.4.1 # via sphinx -import-linter==1.6.0 +import-linter==1.7.0 # via -r requirements/edx/testing.txt importlib-metadata==6.0.0 # via @@ -812,7 +811,7 @@ isodate==0.6.1 # via # -r requirements/edx/testing.txt # python3-saml -isort==5.11.4 +isort==5.12.0 # via # -r requirements/edx/testing.txt # pylint @@ -873,6 +872,7 @@ lazy==1.5 # bok-choy # lti-consumer-xblock # ora2 + # xblock lazy-object-proxy==1.9.0 # via # -r requirements/edx/testing.txt @@ -892,7 +892,9 @@ loremipsum==1.0.5 # -r requirements/edx/testing.txt # ora2 lti-consumer-xblock==7.2.3 - # via -r requirements/edx/testing.txt + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/testing.txt lxml==4.9.2 # via # -r requirements/edx/testing.txt @@ -999,13 +1001,17 @@ oauthlib==3.0.1 # social-auth-core openedx-calc==3.0.1 # via -r requirements/edx/testing.txt +openedx-django-pyfs==3.2.1 + # via + # -r requirements/edx/testing.txt + # xblock openedx-django-wiki==1.1.4 # via -r requirements/edx/testing.txt -openedx-events==4.1.1 +openedx-events==4.2.0 # via # -r requirements/edx/testing.txt # edx-event-bus-kafka -openedx-filters==0.8.0 +openedx-filters==1.0.0 # via # -r requirements/edx/testing.txt # lti-consumer-xblock @@ -1122,7 +1128,7 @@ pycparser==2.21 # via # -r requirements/edx/testing.txt # cffi -pycryptodomex==3.16.0 +pycryptodomex==3.17 # via # -r requirements/edx/testing.txt # edx-proctoring @@ -1271,7 +1277,7 @@ python-levenshtein==0.20.9 # via -r requirements/edx/testing.txt python-memcached==1.59 # via -r requirements/edx/testing.txt -python-slugify==7.0.0 +python-slugify==8.0.0 # via # -r requirements/edx/testing.txt # code-annotations @@ -1400,7 +1406,7 @@ semantic-version==2.10.0 # via # -r requirements/edx/testing.txt # edx-drf-extensions -shapely==2.0.0 +shapely==2.0.1 # via -r requirements/edx/testing.txt simplejson==3.18.1 # via @@ -1500,7 +1506,7 @@ sphinxcontrib-httpdomain==1.8.1 # via sphinxcontrib-openapi sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-openapi[markdown]==0.8.0 +sphinxcontrib-openapi[markdown]==0.8.1 # via -r requirements/edx/development.in sphinxcontrib-qthelp==1.0.3 # via sphinx @@ -1554,6 +1560,7 @@ tomli==2.0.1 # -r requirements/edx/testing.txt # build # coverage + # import-linter # mypy # pylint # pyproject-hooks @@ -1663,7 +1670,7 @@ wrapt==1.14.1 # -r requirements/edx/testing.txt # astroid # deprecated -xblock==1.6.1 +xblock[django]==1.6.2 # via # -r requirements/edx/testing.txt # acid-xblock @@ -1704,7 +1711,7 @@ yarl==1.8.2 # via # -r requirements/edx/testing.txt # aiohttp -zipp==3.11.0 +zipp==3.12.0 # via # -r requirements/edx/testing.txt # importlib-metadata diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 0a74ca1087..ef447a4f79 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -46,7 +46,7 @@ pbr==5.11.1 # via stevedore pygments==2.14.0 # via sphinx -python-slugify==7.0.0 +python-slugify==8.0.0 # via code-annotations pytz==2022.7.1 # via babel @@ -83,5 +83,5 @@ text-unidecode==1.3 # via python-slugify urllib3==1.26.14 # via requests -zipp==3.11.0 +zipp==3.12.0 # via importlib-metadata diff --git a/requirements/edx/pip.txt b/requirements/edx/pip.txt index 3a6094c1fa..ee1b438df3 100644 --- a/requirements/edx/pip.txt +++ b/requirements/edx/pip.txt @@ -6,7 +6,7 @@ # pip==22.3.1 # via -r requirements/edx/pip.in -setuptools==66.1.1 +setuptools==67.0.0 # via -r requirements/edx/pip.in wheel==0.38.4 # via -r requirements/edx/pip.in diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index d58d070f68..830993bcbe 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -91,6 +91,7 @@ billiard==3.6.4.0 # celery bleach[css]==5.0.1 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-enterprise # lti-consumer-xblock @@ -205,7 +206,7 @@ coreschema==0.0.4 # -r requirements/edx/base.txt # coreapi # drf-yasg -coverage[toml]==7.0.5 +coverage[toml]==7.1.0 # via # -r requirements/edx/coverage.txt # pytest-cov @@ -250,7 +251,7 @@ deprecated==1.2.13 # via # -r requirements/edx/base.txt # jwcrypto -diff-cover==7.3.2 +diff-cover==7.4.0 # via -r requirements/edx/coverage.txt dill==0.3.6 # via pylint @@ -274,7 +275,6 @@ django==3.2.16 # django-multi-email-field # django-mysql # django-oauth-toolkit - # django-pyfs # django-sekizai # django-ses # django-splash @@ -315,6 +315,7 @@ django==3.2.16 # jsonfield # learner-pathway-progress # lti-consumer-xblock + # openedx-django-pyfs # openedx-django-wiki # openedx-events # openedx-filters @@ -421,9 +422,7 @@ django-object-actions==4.1.0 # via # -r requirements/edx/base.txt # edx-enterprise -django-pipeline==2.0.8 - # via -r requirements/edx/base.txt -django-pyfs==3.2.0 +django-pipeline==2.0.9 # via -r requirements/edx/base.txt django-ratelimit==4.0.0 # via -r requirements/edx/base.txt @@ -584,7 +583,7 @@ edx-enterprise==3.60.15 # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # learner-pathway-progress -edx-event-bus-kafka==3.6.1 +edx-event-bus-kafka==3.6.3 # via -r requirements/edx/base.txt edx-i18n-tools==0.9.2 # via @@ -683,11 +682,11 @@ execnet==1.9.0 # via pytest-xdist factory-boy==3.2.1 # via -r requirements/edx/testing.in -faker==16.6.0 +faker==16.6.1 # via factory-boy fastapi==0.89.1 # via pact-python -fastavro==1.7.0 +fastavro==1.7.1 # via # -r requirements/edx/base.txt # openedx-events @@ -707,13 +706,13 @@ frozenlist==1.3.3 fs==2.0.27 # via # -r requirements/edx/base.txt - # django-pyfs # fs-s3fs + # openedx-django-pyfs # xblock fs-s3fs==0.1.8 # via # -r requirements/edx/base.txt - # django-pyfs + # openedx-django-pyfs future==0.18.3 # via # -r requirements/edx/base.txt @@ -746,7 +745,7 @@ idna==3.4 # requests # snowflake-connector-python # yarl -import-linter==1.6.0 +import-linter==1.7.0 # via -r requirements/edx/testing.in importlib-metadata==6.0.0 # via @@ -773,7 +772,7 @@ isodate==0.6.1 # via # -r requirements/edx/base.txt # python3-saml -isort==5.11.4 +isort==5.12.0 # via # -r requirements/edx/testing.in # pylint @@ -833,6 +832,7 @@ lazy==1.5 # bok-choy # lti-consumer-xblock # ora2 + # xblock lazy-object-proxy==1.9.0 # via astroid learner-pathway-progress==1.3.3 @@ -850,7 +850,9 @@ loremipsum==1.0.5 # -r requirements/edx/base.txt # ora2 lti-consumer-xblock==7.2.3 - # via -r requirements/edx/base.txt + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/base.txt lxml==4.9.2 # via # -r requirements/edx/base.txt @@ -950,13 +952,17 @@ oauthlib==3.0.1 # social-auth-core openedx-calc==3.0.1 # via -r requirements/edx/base.txt +openedx-django-pyfs==3.2.1 + # via + # -r requirements/edx/base.txt + # xblock openedx-django-wiki==1.1.4 # via -r requirements/edx/base.txt -openedx-events==4.1.1 +openedx-events==4.2.0 # via # -r requirements/edx/base.txt # edx-event-bus-kafka -openedx-filters==0.8.0 +openedx-filters==1.0.0 # via # -r requirements/edx/base.txt # lti-consumer-xblock @@ -1064,7 +1070,7 @@ pycparser==2.21 # via # -r requirements/edx/base.txt # cffi -pycryptodomex==3.16.0 +pycryptodomex==3.17 # via # -r requirements/edx/base.txt # edx-proctoring @@ -1200,7 +1206,7 @@ python-levenshtein==0.20.9 # via -r requirements/edx/base.txt python-memcached==1.59 # via -r requirements/edx/base.txt -python-slugify==7.0.0 +python-slugify==8.0.0 # via # -r requirements/edx/base.txt # code-annotations @@ -1325,7 +1331,7 @@ semantic-version==2.10.0 # via # -r requirements/edx/base.txt # edx-drf-extensions -shapely==2.0.0 +shapely==2.0.1 # via -r requirements/edx/base.txt simplejson==3.18.1 # via @@ -1442,6 +1448,7 @@ tinycss2==1.1.1 tomli==2.0.1 # via # coverage + # import-linter # pylint # pytest # tox @@ -1536,7 +1543,7 @@ wrapt==1.14.1 # -r requirements/edx/base.txt # astroid # deprecated -xblock==1.6.1 +xblock[django]==1.6.2 # via # -r requirements/edx/base.txt # acid-xblock @@ -1577,7 +1584,7 @@ yarl==1.8.2 # via # -r requirements/edx/base.txt # aiohttp -zipp==3.11.0 +zipp==3.12.0 # via # -r requirements/edx/base.txt # importlib-metadata