From 9f42093650e47adb03693310d898ba5c4cd1296f Mon Sep 17 00:00:00 2001 From: MueezKhan246 <93375917+MueezKhan246@users.noreply.github.com> Date: Wed, 22 May 2024 13:32:13 +0000 Subject: [PATCH 1/4] feat: Upgrade Python dependency edx-enterprise removed unencrypted columns of user data credentials in blackboard config ENT 8010 Commit generated by workflow `openedx/edx-platform/.github/workflows/upgrade-one-python-dependency.yml@refs/heads/master` --- requirements/constraints.txt | 2 +- requirements/edx-sandbox/base.txt | 6 +- requirements/edx/assets.txt | 2 +- requirements/edx/base.txt | 38 +--------- requirements/edx/coverage.txt | 2 +- requirements/edx/development.txt | 73 +------------------ requirements/edx/doc.txt | 38 +--------- requirements/edx/paver.txt | 2 +- requirements/edx/semgrep.txt | 14 +--- requirements/edx/testing.txt | 57 +-------------- 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 +- 17 files changed, 26 insertions(+), 253 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index c2fc9b2ddac1..26863832d7f6 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -23,7 +23,7 @@ click>=8.0,<9.0 # The team that owns this package will manually bump this package rather than having it pulled in automatically. # This is to allow them to better control its deployment and to do it in a process that works better # for them. -edx-enterprise==4.19.3 +edx-enterprise==4.19.4 # Stay on LTS version, remove once this is added to common constraint Django<5.0 diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt index 5e3a673caaab..d1d60a294a18 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 66d3d0f13d41..171e30d271c7 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 @@ -54,14 +50,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 @@ -464,7 +452,7 @@ edx-drf-extensions==10.3.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.19.3 +edx-enterprise==4.19.4 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in @@ -599,12 +587,6 @@ importlib-metadata==6.11.0 # via # -c requirements/edx/../common_constraints.txt # -r requirements/edx/kernel.in - # markdown -importlib-resources==5.13.0 - # via - # jsonschema - # jsonschema-specifications - # pycountry inflection==0.5.1 # via # drf-spectacular @@ -823,8 +805,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 @@ -938,7 +918,6 @@ python3-saml==1.16.0 pytz==2024.1 # via # -r requirements/edx/kernel.in - # babel # django-ses # djangorestframework # drf-yasg @@ -1130,21 +1109,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 @@ -1162,7 +1135,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 @@ -1230,9 +1202,7 @@ xss-utils==0.6.0 yarl==1.9.4 # via aiohttp zipp==3.18.1 - # via - # importlib-metadata - # importlib-resources + # via importlib-metadata # 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 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 13b959fa4e48..914d6dd53a3d 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 @@ -112,16 +106,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 @@ -743,7 +727,7 @@ edx-drf-extensions==10.3.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.19.3 +edx-enterprise==4.19.4 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt @@ -878,11 +862,6 @@ event-tracking==2.4.0 # 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 @@ -1013,20 +992,8 @@ import-linter==2.0 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 - # 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 @@ -1420,11 +1387,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 @@ -1703,7 +1665,6 @@ pytz==2024.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt - # babel # django-ses # djangorestframework # drf-yasg @@ -2047,20 +2008,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 @@ -2093,38 +2041,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.10.0 # via @@ -2153,7 +2089,6 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests - # snowflake-connector-python user-util==1.1.0 # via # -r requirements/edx/doc.txt @@ -2291,11 +2226,9 @@ yarl==1.9.4 # pact-python zipp==3.18.1 # 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 f968e6954ea8..5f69ded4f674 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 @@ -77,15 +72,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 @@ -538,7 +524,7 @@ edx-drf-extensions==10.3.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.19.3 +edx-enterprise==4.19.4 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt @@ -692,14 +678,6 @@ 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 inflection==0.5.1 # via # -r requirements/edx/base.txt @@ -963,10 +941,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 @@ -1113,7 +1087,6 @@ python3-saml==1.16.0 pytz==2024.1 # via # -r requirements/edx/base.txt - # babel # django-ses # djangorestframework # drf-yasg @@ -1380,13 +1353,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 @@ -1395,7 +1364,6 @@ typing-extensions==4.11.0 tzdata==2024.1 # via # -r requirements/edx/base.txt - # backports-zoneinfo # celery unicodecsv==0.14.1 # via @@ -1415,7 +1383,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 @@ -1499,7 +1466,6 @@ zipp==3.18.1 # 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 e3c9ca0ce3c0..37e960945d42 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.5 # 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 13e13fe49b28..7bbd5155bf01 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 @@ -80,15 +75,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 @@ -571,7 +557,7 @@ edx-drf-extensions==10.3.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.19.3 +edx-enterprise==4.19.4 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt @@ -671,10 +657,6 @@ event-tracking==2.4.0 # 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 @@ -762,14 +744,6 @@ 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 inflection==0.5.1 # via # -r requirements/edx/base.txt @@ -1051,10 +1025,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 @@ -1272,7 +1242,6 @@ python3-saml==1.16.0 pytz==2024.1 # via # -r requirements/edx/base.txt - # babel # django-ses # djangorestframework # drf-yasg @@ -1501,14 +1470,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 @@ -1526,32 +1487,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.10.0 # via fastapi @@ -1575,7 +1524,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 @@ -1675,7 +1623,6 @@ zipp==3.18.1 # 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 9945c989ae62..f25c4edf5726 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.104 # via -r scripts/user_retirement/requirements/base.in botocore==1.34.104 @@ -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 67d1d9098845..c705721b4c17 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.104 # 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 a31375a927b9004752cef97045764c13338685ac Mon Sep 17 00:00:00 2001 From: MueezKhan246 <93375917+MueezKhan246@users.noreply.github.com> Date: Thu, 23 May 2024 12:57:24 +0000 Subject: [PATCH 2/4] refactor: manually bumping build version --- requirements/edx-sandbox/base.txt | 6 +++++- requirements/edx/assets.txt | 2 +- requirements/edx/coverage.txt | 2 +- requirements/edx/paver.txt | 2 +- requirements/edx/semgrep.txt | 14 ++++++++++++-- requirements/pip-tools.txt | 12 +++++++++++- requirements/pip.txt | 2 +- scripts/structures_pruning/requirements/base.txt | 2 +- .../structures_pruning/requirements/testing.txt | 6 +++++- scripts/user_retirement/requirements/base.txt | 10 ++++++++-- scripts/user_retirement/requirements/testing.txt | 11 ++++++++++- scripts/xblock/requirements.txt | 2 +- 12 files changed, 57 insertions(+), 14 deletions(-) diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt index d1d60a294a18..5e3a673caaab 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.0 + # 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.18.1 + # 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/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/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 37e960945d42..e3c9ca0ce3c0 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.0 + # 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.5 # 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.18.1 + # via importlib-resources diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 450660d8adfb..4b631a73d780 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,10 @@ 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 @@ -18,8 +22,14 @@ 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 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..12c5d2dbdae0 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.1 + # 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.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 f25c4edf5726..9945c989ae62 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.104 # via -r scripts/user_retirement/requirements/base.in botocore==1.34.104 @@ -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 c705721b4c17..67d1d9098845 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.104 # 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.1 + # 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.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 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 From 03bcbcdbbb5bb42b4d01dd03f671e6e3d1746b22 Mon Sep 17 00:00:00 2001 From: MueezKhan246 <93375917+MueezKhan246@users.noreply.github.com> Date: Thu, 23 May 2024 13:34:17 +0000 Subject: [PATCH 3/4] refactor: reverting redundant changes --- requirements/edx/base.txt | 36 ++++++++++++++-- requirements/edx/development.txt | 71 +++++++++++++++++++++++++++++++- requirements/edx/doc.txt | 36 +++++++++++++++- requirements/edx/testing.txt | 55 ++++++++++++++++++++++++- 4 files changed, 191 insertions(+), 7 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 171e30d271c7..71e545abbc04 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 @@ -50,6 +54,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 @@ -587,6 +599,12 @@ importlib-metadata==6.11.0 # via # -c requirements/edx/../common_constraints.txt # -r requirements/edx/kernel.in + # markdown +importlib-resources==5.13.0 + # via + # jsonschema + # jsonschema-specifications + # pycountry inflection==0.5.1 # via # drf-spectacular @@ -805,6 +823,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 @@ -918,6 +938,7 @@ python3-saml==1.16.0 pytz==2024.1 # via # -r requirements/edx/kernel.in + # babel # django-ses # djangorestframework # drf-yasg @@ -1109,15 +1130,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 @@ -1135,6 +1162,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 @@ -1202,7 +1230,9 @@ xss-utils==0.6.0 yarl==1.9.4 # via aiohttp zipp==3.18.1 - # 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/development.txt b/requirements/edx/development.txt index 914d6dd53a3d..65597387ab5f 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 @@ -106,6 +112,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 @@ -862,6 +878,11 @@ event-tracking==2.4.0 # 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 @@ -992,8 +1013,20 @@ import-linter==2.0 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 + # 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 @@ -1387,6 +1420,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 @@ -1665,6 +1703,7 @@ pytz==2024.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt + # babel # django-ses # djangorestframework # drf-yasg @@ -2008,7 +2047,20 @@ tinycss2==1.2.1 # -r requirements/edx/testing.txt # bleach tomli==2.0.1 - # via django-stubs + # 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 @@ -2041,26 +2093,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.10.0 # via @@ -2089,6 +2153,7 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests + # snowflake-connector-python user-util==1.1.0 # via # -r requirements/edx/doc.txt @@ -2226,9 +2291,11 @@ yarl==1.9.4 # pact-python zipp==3.18.1 # 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 5f69ded4f674..1040557bb138 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 @@ -72,6 +77,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,14 @@ 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 inflection==0.5.1 # via # -r requirements/edx/base.txt @@ -941,6 +963,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 @@ -1087,6 +1113,7 @@ python3-saml==1.16.0 pytz==2024.1 # via # -r requirements/edx/base.txt + # babel # django-ses # djangorestframework # drf-yasg @@ -1352,10 +1379,14 @@ tqdm==4.66.4 # openai typing-extensions==4.11.0 # via + # annotated-types + # asgiref # -r requirements/edx/base.txt # django-countries + # drf-spectacular # edx-opaque-keys # jwcrypto + # kombu # pydantic # pydantic-core # pydata-sphinx-theme @@ -1364,6 +1395,7 @@ typing-extensions==4.11.0 tzdata==2024.1 # via # -r requirements/edx/base.txt + # backports-zoneinfo # celery unicodecsv==0.14.1 # via @@ -1383,6 +1415,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 @@ -1466,6 +1499,7 @@ zipp==3.18.1 # 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/testing.txt b/requirements/edx/testing.txt index 7bbd5155bf01..5f7f3823efb9 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 @@ -75,6 +80,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 @@ -657,6 +671,10 @@ event-tracking==2.4.0 # 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 @@ -744,6 +762,14 @@ 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 inflection==0.5.1 # via # -r requirements/edx/base.txt @@ -1025,6 +1051,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 @@ -1243,6 +1273,7 @@ pytz==2024.1 # via # -r requirements/edx/base.txt # django-ses + # babel # djangorestframework # drf-yasg # edx-completion @@ -1470,6 +1501,14 @@ 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 @@ -1487,20 +1526,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.10.0 # via fastapi @@ -1524,6 +1575,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 @@ -1623,6 +1675,7 @@ zipp==3.18.1 # via # -r requirements/edx/base.txt # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools From c9b95568fad5813dce45e32694f1f8905f90caaa Mon Sep 17 00:00:00 2001 From: MueezKhan246 <93375917+MueezKhan246@users.noreply.github.com> Date: Thu, 23 May 2024 13:39:03 +0000 Subject: [PATCH 4/4] refactor: correcting sequence while reverting changes --- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 1040557bb138..71f4dee8a69f 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -1379,9 +1379,9 @@ tqdm==4.66.4 # openai typing-extensions==4.11.0 # via + # -r requirements/edx/base.txt # annotated-types # asgiref - # -r requirements/edx/base.txt # django-countries # drf-spectacular # edx-opaque-keys diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 5f7f3823efb9..617b4e8ed250 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -1272,8 +1272,8 @@ python3-saml==1.16.0 pytz==2024.1 # via # -r requirements/edx/base.txt - # django-ses # babel + # django-ses # djangorestframework # drf-yasg # edx-completion