From d85e55b8c9fe9525a85959394f910090076b9e99 Mon Sep 17 00:00:00 2001 From: Paulo Viadanna Date: Wed, 25 Sep 2024 12:27:55 -0300 Subject: [PATCH 1/3] fix: bump ora2 to fix uploads --- requirements/edx/base.txt | 2 +- requirements/edx/bundled.in | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 2ae5ba235a89..b6ed96b8a108 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -804,7 +804,7 @@ optimizely-sdk==4.1.1 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/bundled.in -ora2==6.9.0 +ora2 @ git+https://github.com/open-craft/edx-ora2@viadanna/block-uploads # via -r requirements/edx/bundled.in packaging==24.0 # via diff --git a/requirements/edx/bundled.in b/requirements/edx/bundled.in index b4685a3a2cbe..8a21c75c9d22 100644 --- a/requirements/edx/bundled.in +++ b/requirements/edx/bundled.in @@ -44,7 +44,9 @@ done-xblock # a very simple XBlock that allows learners recommender-xblock # https://github.com/edx/RecommenderXBlock staff-graded-xblock # https://github.com/openedx/staff_graded-xblock Allows off-site bulk scoring. edx-sga # The more well known "staff graded assignment" XBlock, from MIT. -ora2>=4.5.0 # Open Response Assessment XBlock +# ora2>=4.5.0 # Open Response Assessment XBlock xblock-poll # Xblock for polling users xblock-drag-and-drop-v2 # Drag and Drop XBlock xblock-google-drive # XBlock for google docs and calendar + +git+https://github.com/open-craft/edx-ora2@viadanna/block-uploads From e4e94bf6fecc173aaeaf92a76cc5ed0358a16843 Mon Sep 17 00:00:00 2001 From: Paulo Viadanna Date: Fri, 27 Sep 2024 08:55:55 -0300 Subject: [PATCH 2/3] fix: recompile requirements --- requirements/common_constraints.txt | 15 ++-- requirements/edx-sandbox/base.txt | 6 +- requirements/edx/assets.txt | 2 +- requirements/edx/base.txt | 44 ++--------- requirements/edx/bundled.in | 4 + requirements/edx/coverage.txt | 2 +- requirements/edx/development.txt | 79 ++----------------- requirements/edx/doc.txt | 47 ++--------- requirements/edx/paver.txt | 2 +- requirements/edx/semgrep.txt | 14 +--- requirements/edx/testing.txt | 66 ++-------------- requirements/pip-tools.txt | 12 +-- requirements/pip.txt | 2 +- .../structures_pruning/requirements/base.txt | 2 +- .../requirements/testing.txt | 6 +- scripts/user_retirement/requirements/base.txt | 10 +-- .../user_retirement/requirements/testing.txt | 11 +-- scripts/xblock/requirements.txt | 2 +- 18 files changed, 50 insertions(+), 276 deletions(-) diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 4abc9ae22cb3..605871970bd8 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -21,15 +21,14 @@ Django<5.0 # 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 +# See https://github.com/openedx/edx-platform/issues/35126 for more info elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected -# opentelemetry requires version 6.x at the moment: -# https://github.com/open-telemetry/opentelemetry-python/issues/3570 -# Normally this could be added as a constraint in edx-django-utils, where we're -# adding the opentelemetry dependency. However, when we compile pip-tools.txt, -# that uses version 7.x, and then there's no undoing that when compiling base.txt. -# So we need to pin it globally, for now. -# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407 -importlib-metadata<7 +# Cause: https://github.com/openedx/event-tracking/pull/290 +# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform. +# We will pin event-tracking to do not break existing installations +# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586 +# has been resolved and edx-platform is running with pymongo>=4.4.0 +event-tracking<2.4.1 diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt index d12c994fd206..ee643b98b8cf 100644 --- a/requirements/edx-sandbox/base.txt +++ b/requirements/edx-sandbox/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -22,8 +22,6 @@ cycler==0.12.1 # via matplotlib fonttools==4.51.0 # via matplotlib -importlib-resources==6.4.0 - # via matplotlib joblib==1.4.2 # via nltk kiwisolver==1.4.5 @@ -89,5 +87,3 @@ sympy==1.12 # openedx-calc tqdm==4.66.4 # via nltk -zipp==3.18.1 - # via importlib-resources diff --git a/requirements/edx/assets.txt b/requirements/edx/assets.txt index bcac144e0edb..93206fbc201a 100644 --- a/requirements/edx/assets.txt +++ b/requirements/edx/assets.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index b6ed96b8a108..8e8178de8332 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -33,10 +33,6 @@ asgiref==3.8.1 # django-countries asn1crypto==1.5.1 # via snowflake-connector-python -async-timeout==4.0.3 - # via - # aiohttp - # redis attrs==23.2.0 # via # -r requirements/edx/kernel.in @@ -55,14 +51,6 @@ babel==2.15.0 # enmerkar-underscore backoff==1.10.0 # via analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -c requirements/edx/../constraints.txt - # celery - # django - # edx-milestones - # icalendar - # kombu beautifulsoup4==4.12.3 # via pynliner billiard==4.2.0 @@ -566,6 +554,7 @@ enmerkar-underscore==2.3.0 # via -r requirements/edx/kernel.in event-tracking==2.4.0 # via + # -c requirements/edx/../common_constraints.txt # -r requirements/edx/kernel.in # edx-completion # edx-proctoring @@ -611,15 +600,8 @@ idna==3.7 # requests # snowflake-connector-python # yarl -importlib-metadata==6.11.0 - # via - # -c requirements/edx/../common_constraints.txt - # markdown -importlib-resources==5.13.0 - # via - # jsonschema - # jsonschema-specifications - # pycountry +importlib-metadata==8.5.0 + # via -r requirements/edx/bundled.in inflection==0.5.1 # via # drf-spectacular @@ -842,8 +824,6 @@ pillow==10.3.0 # edx-enterprise # edx-organizations # edxval -pkgutil-resolve-name==1.3.10 - # via jsonschema platformdirs==4.2.1 # via snowflake-connector-python polib==1.2.0 @@ -957,7 +937,6 @@ python3-saml==1.16.0 pytz==2024.1 # via # -r requirements/edx/kernel.in - # babel # django-ses # djangorestframework # drf-yasg @@ -1152,21 +1131,15 @@ tqdm==4.66.4 typing-extensions==4.11.0 # via # -r requirements/edx/paver.txt - # annotated-types - # asgiref # django-countries - # drf-spectacular # edx-opaque-keys # jwcrypto - # kombu # pydantic # pydantic-core # pylti1p3 # snowflake-connector-python tzdata==2024.1 - # via - # backports-zoneinfo - # celery + # via celery unicodecsv==0.14.1 # via # -r requirements/edx/kernel.in @@ -1184,7 +1157,6 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests - # snowflake-connector-python user-util==1.1.0 # via -r requirements/edx/kernel.in vine==5.1.0 @@ -1251,10 +1223,8 @@ xss-utils==0.6.0 # via -r requirements/edx/kernel.in yarl==1.9.4 # via aiohttp -zipp==3.18.1 - # via - # importlib-metadata - # importlib-resources +zipp==3.20.2 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/edx/bundled.in b/requirements/edx/bundled.in index 8a21c75c9d22..3fbdfda5d011 100644 --- a/requirements/edx/bundled.in +++ b/requirements/edx/bundled.in @@ -49,4 +49,8 @@ xblock-poll # Xblock for polling users xblock-drag-and-drop-v2 # Drag and Drop XBlock xblock-google-drive # XBlock for google docs and calendar +# Fix for ORA uploads git+https://github.com/open-craft/edx-ora2@viadanna/block-uploads + +# Missing after compiling requirements +importlib-metadata diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index e150dc3fe238..f583ff90d4f1 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 8b1bb858efe2..33af8e29952d 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -82,12 +82,6 @@ astroid==2.13.5 # -r requirements/edx/testing.txt # pylint # pylint-celery -async-timeout==4.0.3 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # aiohttp - # redis attrs==23.2.0 # via # -r requirements/edx/doc.txt @@ -113,16 +107,6 @@ backoff==1.10.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # celery - # django - # edx-milestones - # icalendar - # kombu beautifulsoup4==4.12.3 # via # -r requirements/edx/doc.txt @@ -894,16 +878,12 @@ enmerkar-underscore==2.3.0 # -r requirements/edx/testing.txt event-tracking==2.4.0 # via + # -c requirements/edx/../common_constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-completion # edx-proctoring # edx-search -exceptiongroup==1.2.1 - # via - # -r requirements/edx/testing.txt - # anyio - # pytest execnet==2.1.1 # via # -r requirements/edx/testing.txt @@ -1031,23 +1011,10 @@ imagesize==1.4.1 # sphinx import-linter==2.0 # via -r requirements/edx/testing.txt -importlib-metadata==6.11.0 - # via - # -c requirements/edx/../common_constraints.txt - # -r requirements/edx/../pip-tools.txt - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # build - # markdown - # pytest-randomly - # sphinx -importlib-resources==5.13.0 +importlib-metadata==8.5.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt - # jsonschema - # jsonschema-specifications - # pycountry inflection==0.5.1 # via # -r requirements/edx/doc.txt @@ -1371,7 +1338,7 @@ optimizely-sdk==4.1.1 # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -ora2==6.9.0 +ora2 @ git+https://github.com/open-craft/edx-ora2@viadanna/block-uploads # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1446,11 +1413,6 @@ pillow==10.3.0 # edxval pip-tools==7.4.1 # via -r requirements/edx/../pip-tools.txt -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # jsonschema platformdirs==4.2.1 # via # -r requirements/edx/doc.txt @@ -1729,7 +1691,6 @@ pytz==2024.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt - # babel # django-ses # djangorestframework # drf-yasg @@ -2075,20 +2036,7 @@ tinycss2==1.2.1 # -r requirements/edx/testing.txt # bleach tomli==2.0.1 - # via - # -r requirements/edx/../pip-tools.txt - # -r requirements/edx/testing.txt - # build - # coverage - # django-stubs - # import-linter - # mypy - # pip-tools - # pylint - # pyproject-api - # pytest - # tox - # vulture + # via django-stubs tomlkit==0.12.5 # via # -r requirements/edx/doc.txt @@ -2121,38 +2069,26 @@ typing-extensions==4.11.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt - # annotated-types - # anyio - # asgiref - # astroid # django-countries # django-stubs # django-stubs-ext # djangorestframework-stubs - # drf-spectacular # edx-opaque-keys # fastapi # grimp # import-linter # jwcrypto - # kombu # mypy - # pact-python # pydantic # pydantic-core # pydata-sphinx-theme - # pylint # pylti1p3 - # rich # snowflake-connector-python - # starlette # typer - # uvicorn tzdata==2024.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt - # backports-zoneinfo # celery ujson==5.9.0 # via @@ -2181,7 +2117,6 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests - # snowflake-connector-python user-util==1.1.0 # via # -r requirements/edx/doc.txt @@ -2317,13 +2252,11 @@ yarl==1.9.4 # -r requirements/edx/testing.txt # aiohttp # pact-python -zipp==3.18.1 +zipp==3.20.2 # via - # -r requirements/edx/../pip-tools.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 9e1dee112300..5947da7497e9 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -51,11 +51,6 @@ asn1crypto==1.5.1 # via # -r requirements/edx/base.txt # snowflake-connector-python -async-timeout==4.0.3 - # via - # -r requirements/edx/base.txt - # aiohttp - # redis attrs==23.2.0 # via # -r requirements/edx/base.txt @@ -78,15 +73,6 @@ backoff==1.10.0 # via # -r requirements/edx/base.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/base.txt - # celery - # django - # edx-milestones - # icalendar - # kombu beautifulsoup4==4.12.3 # via # -r requirements/edx/base.txt @@ -650,6 +636,7 @@ enmerkar-underscore==2.3.0 # via -r requirements/edx/base.txt event-tracking==2.4.0 # via + # -c requirements/edx/../common_constraints.txt # -r requirements/edx/base.txt # edx-completion # edx-proctoring @@ -708,18 +695,8 @@ idna==3.7 # yarl imagesize==1.4.1 # via sphinx -importlib-metadata==6.11.0 - # via - # -c requirements/edx/../common_constraints.txt - # -r requirements/edx/base.txt - # markdown - # sphinx -importlib-resources==5.13.0 - # via - # -r requirements/edx/base.txt - # jsonschema - # jsonschema-specifications - # pycountry +importlib-metadata==8.5.0 + # via -r requirements/edx/base.txt inflection==0.5.1 # via # -r requirements/edx/base.txt @@ -940,7 +917,7 @@ optimizely-sdk==4.1.1 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt -ora2==6.9.0 +ora2 @ git+https://github.com/open-craft/edx-ora2@viadanna/block-uploads # via -r requirements/edx/base.txt packaging==24.0 # via @@ -987,10 +964,6 @@ pillow==10.3.0 # edx-enterprise # edx-organizations # edxval -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/edx/base.txt - # jsonschema platformdirs==4.2.1 # via # -r requirements/edx/base.txt @@ -1137,7 +1110,6 @@ python3-saml==1.16.0 pytz==2024.1 # via # -r requirements/edx/base.txt - # babel # django-ses # djangorestframework # drf-yasg @@ -1406,13 +1378,9 @@ tqdm==4.66.4 typing-extensions==4.11.0 # via # -r requirements/edx/base.txt - # annotated-types - # asgiref # django-countries - # drf-spectacular # edx-opaque-keys # jwcrypto - # kombu # pydantic # pydantic-core # pydata-sphinx-theme @@ -1421,7 +1389,6 @@ typing-extensions==4.11.0 tzdata==2024.1 # via # -r requirements/edx/base.txt - # backports-zoneinfo # celery unicodecsv==0.14.1 # via @@ -1441,7 +1408,6 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests - # snowflake-connector-python user-util==1.1.0 # via -r requirements/edx/base.txt vine==5.1.0 @@ -1521,11 +1487,10 @@ yarl==1.9.4 # via # -r requirements/edx/base.txt # aiohttp -zipp==3.18.1 +zipp==3.20.2 # via # -r requirements/edx/base.txt # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index e099e333ea96..ea620f96d377 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade diff --git a/requirements/edx/semgrep.txt b/requirements/edx/semgrep.txt index ec1ee016e564..b698dec87607 100644 --- a/requirements/edx/semgrep.txt +++ b/requirements/edx/semgrep.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -40,10 +40,6 @@ glom==22.1.0 # via semgrep idna==3.7 # via requests -importlib-resources==6.4.0 - # via - # jsonschema - # jsonschema-specifications jsonschema==4.22.0 # via semgrep jsonschema-specifications==2023.12.1 @@ -56,8 +52,6 @@ packaging==24.0 # via semgrep peewee==3.17.3 # via semgrep -pkgutil-resolve-name==1.3.10 - # via jsonschema pygments==2.18.0 # via rich referencing==0.35.1 @@ -81,9 +75,7 @@ semgrep==1.52.0 tomli==2.0.1 # via semgrep typing-extensions==4.11.0 - # via - # rich - # semgrep + # via semgrep urllib3==1.26.18 # via # -c requirements/edx/../constraints.txt @@ -91,5 +83,3 @@ urllib3==1.26.18 # semgrep wcmatch==8.5.1 # via semgrep -zipp==3.18.1 - # via importlib-resources diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 452fec9a8643..ed7c0c45a403 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -56,11 +56,6 @@ astroid==2.13.5 # via # pylint # pylint-celery -async-timeout==4.0.3 - # via - # -r requirements/edx/base.txt - # aiohttp - # redis attrs==23.2.0 # via # -r requirements/edx/base.txt @@ -81,15 +76,6 @@ backoff==1.10.0 # via # -r requirements/edx/base.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/base.txt - # celery - # django - # edx-milestones - # icalendar - # kombu beautifulsoup4==4.12.3 # via # -r requirements/edx/base.txt @@ -687,14 +673,11 @@ enmerkar-underscore==2.3.0 # via -r requirements/edx/base.txt event-tracking==2.4.0 # via + # -c requirements/edx/../common_constraints.txt # -r requirements/edx/base.txt # edx-completion # edx-proctoring # edx-search -exceptiongroup==1.2.1 - # via - # anyio - # pytest execnet==2.1.1 # via pytest-xdist factory-boy==3.3.0 @@ -778,18 +761,8 @@ idna==3.7 # yarl import-linter==2.0 # via -r requirements/edx/testing.in -importlib-metadata==6.11.0 - # via - # -c requirements/edx/../common_constraints.txt - # -r requirements/edx/base.txt - # markdown - # pytest-randomly -importlib-resources==5.13.0 - # via - # -r requirements/edx/base.txt - # jsonschema - # jsonschema-specifications - # pycountry +importlib-metadata==8.5.0 + # via -r requirements/edx/base.txt inflection==0.5.1 # via # -r requirements/edx/base.txt @@ -1025,7 +998,7 @@ optimizely-sdk==4.1.1 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt -ora2==6.9.0 +ora2 @ git+https://github.com/open-craft/edx-ora2@viadanna/block-uploads # via -r requirements/edx/base.txt orjson==3.10.3 # via fastapi @@ -1075,10 +1048,6 @@ pillow==10.3.0 # edx-enterprise # edx-organizations # edxval -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/edx/base.txt - # jsonschema platformdirs==4.2.1 # via # -r requirements/edx/base.txt @@ -1296,7 +1265,6 @@ python3-saml==1.16.0 pytz==2024.1 # via # -r requirements/edx/base.txt - # babel # django-ses # djangorestframework # drf-yasg @@ -1527,14 +1495,6 @@ tinycss2==1.2.1 # via # -r requirements/edx/base.txt # bleach -tomli==2.0.1 - # via - # coverage - # import-linter - # pylint - # pyproject-api - # pytest - # tox tomlkit==0.12.5 # via # -r requirements/edx/base.txt @@ -1552,32 +1512,20 @@ typer==0.12.3 typing-extensions==4.11.0 # via # -r requirements/edx/base.txt - # annotated-types - # anyio - # asgiref - # astroid # django-countries - # drf-spectacular # edx-opaque-keys # fastapi # grimp # import-linter # jwcrypto - # kombu - # pact-python # pydantic # pydantic-core - # pylint # pylti1p3 - # rich # snowflake-connector-python - # starlette # typer - # uvicorn tzdata==2024.1 # via # -r requirements/edx/base.txt - # backports-zoneinfo # celery ujson==5.9.0 # via fastapi @@ -1601,7 +1549,6 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests - # snowflake-connector-python user-util==1.1.0 # via -r requirements/edx/base.txt uvicorn[standard]==0.29.0 @@ -1697,11 +1644,10 @@ yarl==1.9.4 # -r requirements/edx/base.txt # aiohttp # pact-python -zipp==3.18.1 +zipp==3.20.2 # via # -r requirements/edx/base.txt # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 4b631a73d780..450660d8adfb 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -10,10 +10,6 @@ click==8.1.6 # via # -c requirements/constraints.txt # pip-tools -importlib-metadata==6.11.0 - # via - # -c requirements/common_constraints.txt - # build packaging==24.0 # via build pip-tools==7.4.1 @@ -22,14 +18,8 @@ pyproject-hooks==1.1.0 # via # build # pip-tools -tomli==2.0.1 - # via - # build - # pip-tools wheel==0.43.0 # via pip-tools -zipp==3.18.1 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/pip.txt b/requirements/pip.txt index e3ffcc7b6daf..32427cdbdd18 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade diff --git a/scripts/structures_pruning/requirements/base.txt b/scripts/structures_pruning/requirements/base.txt index dcf9fe1eb0ae..5c267a5efe59 100644 --- a/scripts/structures_pruning/requirements/base.txt +++ b/scripts/structures_pruning/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade diff --git a/scripts/structures_pruning/requirements/testing.txt b/scripts/structures_pruning/requirements/testing.txt index 12c5d2dbdae0..c9145aec8970 100644 --- a/scripts/structures_pruning/requirements/testing.txt +++ b/scripts/structures_pruning/requirements/testing.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -14,8 +14,6 @@ ddt==1.7.2 # via -r scripts/structures_pruning/requirements/testing.in edx-opaque-keys==2.9.0 # via -r scripts/structures_pruning/requirements/base.txt -exceptiongroup==1.2.1 - # via pytest iniconfig==2.0.0 # via pytest packaging==24.0 @@ -36,8 +34,6 @@ stevedore==5.2.0 # via # -r scripts/structures_pruning/requirements/base.txt # edx-opaque-keys -tomli==2.0.1 - # via pytest typing-extensions==4.11.0 # via # -r scripts/structures_pruning/requirements/base.txt diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt index 934f4293d699..5cc39e1ebc17 100644 --- a/scripts/user_retirement/requirements/base.txt +++ b/scripts/user_retirement/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -10,10 +10,6 @@ attrs==23.2.0 # via zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.in -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt - # django boto3==1.34.101 # via -r scripts/user_retirement/requirements/base.in botocore==1.34.101 @@ -161,9 +157,7 @@ sqlparse==0.5.0 stevedore==5.2.0 # via edx-django-utils typing-extensions==4.11.0 - # via - # asgiref - # simple-salesforce + # via simple-salesforce unicodecsv==0.14.1 # via -r scripts/user_retirement/requirements/base.in uritemplate==4.1.1 diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt index 2bae9bb1a272..fed3d13543cc 100644 --- a/scripts/user_retirement/requirements/testing.txt +++ b/scripts/user_retirement/requirements/testing.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -14,10 +14,6 @@ attrs==23.2.0 # zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.txt -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -r scripts/user_retirement/requirements/base.txt - # django boto3==1.34.101 # via # -r scripts/user_retirement/requirements/base.txt @@ -76,8 +72,6 @@ edx-django-utils==5.13.0 # edx-rest-api-client edx-rest-api-client==5.7.0 # via -r scripts/user_retirement/requirements/base.txt -exceptiongroup==1.2.1 - # via pytest google-api-core==2.19.0 # via # -r scripts/user_retirement/requirements/base.txt @@ -268,12 +262,9 @@ stevedore==5.2.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -tomli==2.0.1 - # via pytest typing-extensions==4.11.0 # via # -r scripts/user_retirement/requirements/base.txt - # asgiref # simple-salesforce unicodecsv==0.14.1 # via -r scripts/user_retirement/requirements/base.txt diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt index 241676ac91fd..0e44737bca0d 100644 --- a/scripts/xblock/requirements.txt +++ b/scripts/xblock/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade From 03b6684c2727370fe7411b8c000c9a82cce6cd59 Mon Sep 17 00:00:00 2001 From: Paulo Viadanna Date: Wed, 9 Oct 2024 18:21:07 -0300 Subject: [PATCH 3/3] chore: recompile requirements with py38 --- requirements/edx-sandbox/base.txt | 6 +- requirements/edx/assets.txt | 2 +- requirements/edx/base.txt | 39 +++++++++- requirements/edx/coverage.txt | 2 +- requirements/edx/development.txt | 73 ++++++++++++++++++- requirements/edx/doc.txt | 39 +++++++++- requirements/edx/paver.txt | 2 +- requirements/edx/semgrep.txt | 14 +++- requirements/edx/testing.txt | 58 ++++++++++++++- requirements/pip-tools.txt | 10 ++- requirements/pip.txt | 2 +- .../structures_pruning/requirements/base.txt | 2 +- .../requirements/testing.txt | 6 +- scripts/user_retirement/requirements/base.txt | 10 ++- .../user_retirement/requirements/testing.txt | 11 ++- scripts/xblock/requirements.txt | 2 +- 16 files changed, 253 insertions(+), 25 deletions(-) diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt index ee643b98b8cf..1a9e87b73021 100644 --- a/requirements/edx-sandbox/base.txt +++ b/requirements/edx-sandbox/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -22,6 +22,8 @@ cycler==0.12.1 # via matplotlib fonttools==4.51.0 # via matplotlib +importlib-resources==6.4.5 + # via matplotlib joblib==1.4.2 # via nltk kiwisolver==1.4.5 @@ -87,3 +89,5 @@ sympy==1.12 # openedx-calc tqdm==4.66.4 # via nltk +zipp==3.20.2 + # via importlib-resources diff --git a/requirements/edx/assets.txt b/requirements/edx/assets.txt index 93206fbc201a..bcac144e0edb 100644 --- a/requirements/edx/assets.txt +++ b/requirements/edx/assets.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 8e8178de8332..decf2a857a22 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -33,6 +33,10 @@ asgiref==3.8.1 # django-countries asn1crypto==1.5.1 # via snowflake-connector-python +async-timeout==4.0.3 + # via + # aiohttp + # redis attrs==23.2.0 # via # -r requirements/edx/kernel.in @@ -51,6 +55,14 @@ babel==2.15.0 # enmerkar-underscore backoff==1.10.0 # via analytics-python +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" + # via + # -c requirements/edx/../constraints.txt + # celery + # django + # edx-milestones + # icalendar + # kombu beautifulsoup4==4.12.3 # via pynliner billiard==4.2.0 @@ -601,7 +613,14 @@ idna==3.7 # snowflake-connector-python # yarl importlib-metadata==8.5.0 - # via -r requirements/edx/bundled.in + # via + # -r requirements/edx/bundled.in + # markdown +importlib-resources==5.13.0 + # via + # jsonschema + # jsonschema-specifications + # pycountry inflection==0.5.1 # via # drf-spectacular @@ -824,6 +843,8 @@ pillow==10.3.0 # edx-enterprise # edx-organizations # edxval +pkgutil-resolve-name==1.3.10 + # via jsonschema platformdirs==4.2.1 # via snowflake-connector-python polib==1.2.0 @@ -937,6 +958,7 @@ python3-saml==1.16.0 pytz==2024.1 # via # -r requirements/edx/kernel.in + # babel # django-ses # djangorestframework # drf-yasg @@ -1131,15 +1153,21 @@ tqdm==4.66.4 typing-extensions==4.11.0 # via # -r requirements/edx/paver.txt + # annotated-types + # asgiref # django-countries + # drf-spectacular # edx-opaque-keys # jwcrypto + # kombu # pydantic # pydantic-core # pylti1p3 # snowflake-connector-python tzdata==2024.1 - # via celery + # via + # backports-zoneinfo + # celery unicodecsv==0.14.1 # via # -r requirements/edx/kernel.in @@ -1157,6 +1185,7 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests + # snowflake-connector-python user-util==1.1.0 # via -r requirements/edx/kernel.in vine==5.1.0 @@ -1224,7 +1253,9 @@ xss-utils==0.6.0 yarl==1.9.4 # via aiohttp zipp==3.20.2 - # via importlib-metadata + # via + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index f583ff90d4f1..e150dc3fe238 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 33af8e29952d..59c7d093f164 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -82,6 +82,12 @@ astroid==2.13.5 # -r requirements/edx/testing.txt # pylint # pylint-celery +async-timeout==4.0.3 + # via + # -r requirements/edx/doc.txt + # -r requirements/edx/testing.txt + # aiohttp + # redis attrs==23.2.0 # via # -r requirements/edx/doc.txt @@ -107,6 +113,16 @@ backoff==1.10.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # analytics-python +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/doc.txt + # -r requirements/edx/testing.txt + # celery + # django + # edx-milestones + # icalendar + # kombu beautifulsoup4==4.12.3 # via # -r requirements/edx/doc.txt @@ -884,6 +900,11 @@ event-tracking==2.4.0 # edx-completion # edx-proctoring # edx-search +exceptiongroup==1.2.2 + # via + # -r requirements/edx/testing.txt + # anyio + # pytest execnet==2.1.1 # via # -r requirements/edx/testing.txt @@ -1013,8 +1034,20 @@ import-linter==2.0 # via -r requirements/edx/testing.txt importlib-metadata==8.5.0 # via + # -r requirements/edx/../pip-tools.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt + # build + # markdown + # pytest-randomly + # sphinx +importlib-resources==5.13.0 + # via + # -r requirements/edx/doc.txt + # -r requirements/edx/testing.txt + # jsonschema + # jsonschema-specifications + # pycountry inflection==0.5.1 # via # -r requirements/edx/doc.txt @@ -1413,6 +1446,11 @@ pillow==10.3.0 # edxval pip-tools==7.4.1 # via -r requirements/edx/../pip-tools.txt +pkgutil-resolve-name==1.3.10 + # via + # -r requirements/edx/doc.txt + # -r requirements/edx/testing.txt + # jsonschema platformdirs==4.2.1 # via # -r requirements/edx/doc.txt @@ -1691,6 +1729,7 @@ pytz==2024.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt + # babel # django-ses # djangorestframework # drf-yasg @@ -2035,8 +2074,21 @@ tinycss2==1.2.1 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # bleach -tomli==2.0.1 - # via django-stubs +tomli==2.0.2 + # via + # -r requirements/edx/../pip-tools.txt + # -r requirements/edx/testing.txt + # build + # coverage + # django-stubs + # import-linter + # mypy + # pip-tools + # pylint + # pyproject-api + # pytest + # tox + # vulture tomlkit==0.12.5 # via # -r requirements/edx/doc.txt @@ -2069,26 +2121,38 @@ typing-extensions==4.11.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt + # annotated-types + # anyio + # asgiref + # astroid # django-countries # django-stubs # django-stubs-ext # djangorestframework-stubs + # drf-spectacular # edx-opaque-keys # fastapi # grimp # import-linter # jwcrypto + # kombu # mypy + # pact-python # pydantic # pydantic-core # pydata-sphinx-theme + # pylint # pylti1p3 + # rich # snowflake-connector-python + # starlette # typer + # uvicorn tzdata==2024.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt + # backports-zoneinfo # celery ujson==5.9.0 # via @@ -2117,6 +2181,7 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests + # snowflake-connector-python user-util==1.1.0 # via # -r requirements/edx/doc.txt @@ -2254,9 +2319,11 @@ yarl==1.9.4 # pact-python zipp==3.20.2 # via + # -r requirements/edx/../pip-tools.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 5947da7497e9..00f8420bc6b3 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -51,6 +51,11 @@ asn1crypto==1.5.1 # via # -r requirements/edx/base.txt # snowflake-connector-python +async-timeout==4.0.3 + # via + # -r requirements/edx/base.txt + # aiohttp + # redis attrs==23.2.0 # via # -r requirements/edx/base.txt @@ -73,6 +78,15 @@ backoff==1.10.0 # via # -r requirements/edx/base.txt # analytics-python +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/base.txt + # celery + # django + # edx-milestones + # icalendar + # kombu beautifulsoup4==4.12.3 # via # -r requirements/edx/base.txt @@ -696,7 +710,16 @@ idna==3.7 imagesize==1.4.1 # via sphinx importlib-metadata==8.5.0 - # via -r requirements/edx/base.txt + # via + # -r requirements/edx/base.txt + # markdown + # sphinx +importlib-resources==5.13.0 + # via + # -r requirements/edx/base.txt + # jsonschema + # jsonschema-specifications + # pycountry inflection==0.5.1 # via # -r requirements/edx/base.txt @@ -964,6 +987,10 @@ pillow==10.3.0 # edx-enterprise # edx-organizations # edxval +pkgutil-resolve-name==1.3.10 + # via + # -r requirements/edx/base.txt + # jsonschema platformdirs==4.2.1 # via # -r requirements/edx/base.txt @@ -1110,6 +1137,7 @@ python3-saml==1.16.0 pytz==2024.1 # via # -r requirements/edx/base.txt + # babel # django-ses # djangorestframework # drf-yasg @@ -1378,9 +1406,13 @@ tqdm==4.66.4 typing-extensions==4.11.0 # via # -r requirements/edx/base.txt + # annotated-types + # asgiref # django-countries + # drf-spectacular # edx-opaque-keys # jwcrypto + # kombu # pydantic # pydantic-core # pydata-sphinx-theme @@ -1389,6 +1421,7 @@ typing-extensions==4.11.0 tzdata==2024.1 # via # -r requirements/edx/base.txt + # backports-zoneinfo # celery unicodecsv==0.14.1 # via @@ -1408,6 +1441,7 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests + # snowflake-connector-python user-util==1.1.0 # via -r requirements/edx/base.txt vine==5.1.0 @@ -1491,6 +1525,7 @@ zipp==3.20.2 # via # -r requirements/edx/base.txt # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index ea620f96d377..e099e333ea96 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade diff --git a/requirements/edx/semgrep.txt b/requirements/edx/semgrep.txt index b698dec87607..110d877fc52e 100644 --- a/requirements/edx/semgrep.txt +++ b/requirements/edx/semgrep.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -40,6 +40,10 @@ glom==22.1.0 # via semgrep idna==3.7 # via requests +importlib-resources==6.4.5 + # via + # jsonschema + # jsonschema-specifications jsonschema==4.22.0 # via semgrep jsonschema-specifications==2023.12.1 @@ -52,6 +56,8 @@ packaging==24.0 # via semgrep peewee==3.17.3 # via semgrep +pkgutil-resolve-name==1.3.10 + # via jsonschema pygments==2.18.0 # via rich referencing==0.35.1 @@ -75,7 +81,9 @@ semgrep==1.52.0 tomli==2.0.1 # via semgrep typing-extensions==4.11.0 - # via semgrep + # via + # rich + # semgrep urllib3==1.26.18 # via # -c requirements/edx/../constraints.txt @@ -83,3 +91,5 @@ urllib3==1.26.18 # semgrep wcmatch==8.5.1 # via semgrep +zipp==3.20.2 + # via importlib-resources diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index ed7c0c45a403..ffce92d30276 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -56,6 +56,11 @@ astroid==2.13.5 # via # pylint # pylint-celery +async-timeout==4.0.3 + # via + # -r requirements/edx/base.txt + # aiohttp + # redis attrs==23.2.0 # via # -r requirements/edx/base.txt @@ -76,6 +81,15 @@ backoff==1.10.0 # via # -r requirements/edx/base.txt # analytics-python +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/base.txt + # celery + # django + # edx-milestones + # icalendar + # kombu beautifulsoup4==4.12.3 # via # -r requirements/edx/base.txt @@ -678,6 +692,10 @@ event-tracking==2.4.0 # edx-completion # edx-proctoring # edx-search +exceptiongroup==1.2.2 + # via + # anyio + # pytest execnet==2.1.1 # via pytest-xdist factory-boy==3.3.0 @@ -762,7 +780,16 @@ idna==3.7 import-linter==2.0 # via -r requirements/edx/testing.in importlib-metadata==8.5.0 - # via -r requirements/edx/base.txt + # via + # -r requirements/edx/base.txt + # markdown + # pytest-randomly +importlib-resources==5.13.0 + # via + # -r requirements/edx/base.txt + # jsonschema + # jsonschema-specifications + # pycountry inflection==0.5.1 # via # -r requirements/edx/base.txt @@ -1048,6 +1075,10 @@ pillow==10.3.0 # edx-enterprise # edx-organizations # edxval +pkgutil-resolve-name==1.3.10 + # via + # -r requirements/edx/base.txt + # jsonschema platformdirs==4.2.1 # via # -r requirements/edx/base.txt @@ -1265,6 +1296,7 @@ python3-saml==1.16.0 pytz==2024.1 # via # -r requirements/edx/base.txt + # babel # django-ses # djangorestframework # drf-yasg @@ -1495,6 +1527,14 @@ tinycss2==1.2.1 # via # -r requirements/edx/base.txt # bleach +tomli==2.0.2 + # via + # coverage + # import-linter + # pylint + # pyproject-api + # pytest + # tox tomlkit==0.12.5 # via # -r requirements/edx/base.txt @@ -1512,20 +1552,32 @@ typer==0.12.3 typing-extensions==4.11.0 # via # -r requirements/edx/base.txt + # annotated-types + # anyio + # asgiref + # astroid # django-countries + # drf-spectacular # edx-opaque-keys # fastapi # grimp # import-linter # jwcrypto + # kombu + # pact-python # pydantic # pydantic-core + # pylint # pylti1p3 + # rich # snowflake-connector-python + # starlette # typer + # uvicorn tzdata==2024.1 # via # -r requirements/edx/base.txt + # backports-zoneinfo # celery ujson==5.9.0 # via fastapi @@ -1549,6 +1601,7 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests + # snowflake-connector-python user-util==1.1.0 # via -r requirements/edx/base.txt uvicorn[standard]==0.29.0 @@ -1648,6 +1701,7 @@ zipp==3.20.2 # via # -r requirements/edx/base.txt # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 450660d8adfb..a80930bd7603 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -10,6 +10,8 @@ click==8.1.6 # via # -c requirements/constraints.txt # pip-tools +importlib-metadata==8.5.0 + # via build packaging==24.0 # via build pip-tools==7.4.1 @@ -18,8 +20,14 @@ pyproject-hooks==1.1.0 # via # build # pip-tools +tomli==2.0.2 + # via + # build + # pip-tools wheel==0.43.0 # via pip-tools +zipp==3.20.2 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/pip.txt b/requirements/pip.txt index 32427cdbdd18..e3ffcc7b6daf 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade diff --git a/scripts/structures_pruning/requirements/base.txt b/scripts/structures_pruning/requirements/base.txt index 5c267a5efe59..dcf9fe1eb0ae 100644 --- a/scripts/structures_pruning/requirements/base.txt +++ b/scripts/structures_pruning/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade diff --git a/scripts/structures_pruning/requirements/testing.txt b/scripts/structures_pruning/requirements/testing.txt index c9145aec8970..5b49147a734b 100644 --- a/scripts/structures_pruning/requirements/testing.txt +++ b/scripts/structures_pruning/requirements/testing.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -14,6 +14,8 @@ ddt==1.7.2 # via -r scripts/structures_pruning/requirements/testing.in edx-opaque-keys==2.9.0 # via -r scripts/structures_pruning/requirements/base.txt +exceptiongroup==1.2.2 + # via pytest iniconfig==2.0.0 # via pytest packaging==24.0 @@ -34,6 +36,8 @@ stevedore==5.2.0 # via # -r scripts/structures_pruning/requirements/base.txt # edx-opaque-keys +tomli==2.0.2 + # via pytest typing-extensions==4.11.0 # via # -r scripts/structures_pruning/requirements/base.txt diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt index 5cc39e1ebc17..934f4293d699 100644 --- a/scripts/user_retirement/requirements/base.txt +++ b/scripts/user_retirement/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -10,6 +10,10 @@ attrs==23.2.0 # via zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.in +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt + # django boto3==1.34.101 # via -r scripts/user_retirement/requirements/base.in botocore==1.34.101 @@ -157,7 +161,9 @@ sqlparse==0.5.0 stevedore==5.2.0 # via edx-django-utils typing-extensions==4.11.0 - # via simple-salesforce + # via + # asgiref + # simple-salesforce unicodecsv==0.14.1 # via -r scripts/user_retirement/requirements/base.in uritemplate==4.1.1 diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt index fed3d13543cc..b5263189231a 100644 --- a/scripts/user_retirement/requirements/testing.txt +++ b/scripts/user_retirement/requirements/testing.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -14,6 +14,10 @@ attrs==23.2.0 # zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.txt +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -r scripts/user_retirement/requirements/base.txt + # django boto3==1.34.101 # via # -r scripts/user_retirement/requirements/base.txt @@ -72,6 +76,8 @@ edx-django-utils==5.13.0 # edx-rest-api-client edx-rest-api-client==5.7.0 # via -r scripts/user_retirement/requirements/base.txt +exceptiongroup==1.2.2 + # via pytest google-api-core==2.19.0 # via # -r scripts/user_retirement/requirements/base.txt @@ -262,9 +268,12 @@ stevedore==5.2.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils +tomli==2.0.2 + # via pytest typing-extensions==4.11.0 # via # -r scripts/user_retirement/requirements/base.txt + # asgiref # simple-salesforce unicodecsv==0.14.1 # via -r scripts/user_retirement/requirements/base.txt diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt index 0e44737bca0d..241676ac91fd 100644 --- a/scripts/xblock/requirements.txt +++ b/scripts/xblock/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade