From 052338418ec2a2c04603ae441614c2dff9e7ca4e Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Thu, 10 Oct 2024 16:21:17 -0400 Subject: [PATCH 1/3] Revert "feat: Unpin xmlsec and lxml." This reverts commit 6c045c7b390aa051484cee459a767b246f04e7d8. --- requirements/constraints.txt | 19 +++ requirements/edx-sandbox/base.txt | 5 +- requirements/edx/base.txt | 74 ++++++------ requirements/edx/coverage.txt | 4 +- requirements/edx/development.txt | 110 ++++++++---------- requirements/edx/doc.txt | 77 ++++++------ requirements/edx/paver.txt | 6 +- requirements/edx/semgrep.txt | 8 +- requirements/edx/testing.txt | 96 +++++++-------- requirements/pip-tools.txt | 4 +- .../structures_pruning/requirements/base.txt | 2 +- .../requirements/testing.txt | 2 +- scripts/user_retirement/requirements/base.txt | 23 ++-- .../user_retirement/requirements/testing.txt | 23 ++-- 14 files changed, 229 insertions(+), 224 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 2fc1a1e745f3..dd727a4b1801 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -84,6 +84,13 @@ django-storages<1.14.4 # for them. edx-enterprise==4.27.2 +# Date: 2024-05-09 +# This has to be constrained as well because newer versions of edx-i18n-tools need the +# newer version of lxml but that requirement was not made expilict in the 1.6.0 version +# of the package. This can be un-pinned when we're upgrading lxml. +# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35274 +edx-i18n-tools<1.6.0 + # Date: 2024-07-26 # To override the constraint of edx-lint # This can be removed once https://github.com/openedx/edx-platform/issues/34586 is resolved @@ -98,6 +105,13 @@ event-tracking==3.0.0 # https://github.com/openedx/edx-platform/issues/31616 libsass==0.10.0 +# Date: 2024-04-30 +# lxml>=5.0 introduced breaking changes related to system dependencies +# lxml==5.2.1 introduced new extra so we'll nee to rename lxml --> lxml[html-clean] +# This constraint can be removed once we upgrade to Python 3.11 +# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35272 +lxml<5.0 + # Date: 2018-12-14 # markdown>=3.4.0 has failures due to internal refactorings which causes the tests to fail # pinning the version untill the issue gets resolved in the package itself @@ -173,3 +187,8 @@ social-auth-app-django<=5.4.1 # which require urllib3<2 for now. # Issue for unpinning: https://github.com/openedx/edx-platform/issues/32222 urllib3<2.0.0 + +# Date: 2024-04-24 +# xmlsec==1.3.14 breaking tests or all builds, can be removed once a fix is available +# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35264 +xmlsec<1.3.14 diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt index 0a708b2bbf52..bf0a4376da70 100644 --- a/requirements/edx-sandbox/base.txt +++ b/requirements/edx-sandbox/base.txt @@ -26,11 +26,12 @@ joblib==1.4.2 # via nltk kiwisolver==1.4.7 # via matplotlib -lxml==5.3.0 +lxml==4.9.4 # via + # -c requirements/edx-sandbox/../constraints.txt # -r requirements/edx-sandbox/base.in # openedx-calc -markupsafe==3.0.1 +markupsafe==2.1.5 # via # chem # openedx-calc diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index c7f7828f4115..55793bd0c5af 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -6,11 +6,11 @@ # -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/github.in -acid-xblock==0.4.1 +acid-xblock==0.3.1 # via -r requirements/edx/kernel.in -aiohappyeyeballs==2.4.3 +aiohappyeyeballs==2.4.0 # via aiohttp -aiohttp==3.10.9 +aiohttp==3.10.6 # via # geoip2 # openai @@ -70,13 +70,13 @@ bleach[css]==6.1.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/kernel.in -boto3==1.35.37 +boto3==1.35.27 # via # -r requirements/edx/kernel.in # django-ses # fs-s3fs # ora2 -botocore==1.35.37 +botocore==1.35.27 # via # -r requirements/edx/kernel.in # boto3 @@ -87,7 +87,7 @@ cachecontrol==0.14.0 # via firebase-admin cachetools==5.5.0 # via google-auth -camel-converter[pydantic]==4.0.1 +camel-converter[pydantic]==3.1.2 # via meilisearch celery==5.4.0 # via @@ -328,7 +328,7 @@ django-sekizai==4.1.0 # via # -r requirements/edx/kernel.in # openedx-django-wiki -django-ses==4.2.0 +django-ses==4.1.1 # via -r requirements/edx/bundled.in django-simple-history==3.4.0 # via @@ -387,7 +387,7 @@ djangorestframework==3.14.0 # super-csv djangorestframework-xml==2.0.0 # via edx-enterprise -dnspython==2.7.0 +dnspython==2.6.1 # via # -r requirements/edx/paver.txt # pymongo @@ -429,7 +429,7 @@ edx-celeryutils==1.3.0 # super-csv edx-codejail==3.4.1 # via -r requirements/edx/kernel.in -edx-completion==4.7.2 +edx-completion==4.7.1 # via -r requirements/edx/kernel.in edx-django-release-util==1.4.0 # via @@ -438,7 +438,7 @@ edx-django-release-util==1.4.0 # edxval edx-django-sites-extensions==4.2.0 # via -r requirements/edx/kernel.in -edx-django-utils==6.0.0 +edx-django-utils==5.16.0 # via # -r requirements/edx/kernel.in # django-config-models @@ -475,8 +475,9 @@ edx-event-bus-kafka==5.8.1 # via -r requirements/edx/kernel.in edx-event-bus-redis==0.5.0 # via -r requirements/edx/kernel.in -edx-i18n-tools==1.6.3 +edx-i18n-tools==1.5.0 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/bundled.in # ora2 edx-milestones==0.6.0 @@ -516,7 +517,7 @@ edx-search==4.0.0 # via -r requirements/edx/kernel.in edx-sga==0.25.0 # via -r requirements/edx/bundled.in -edx-submissions==3.8.1 +edx-submissions==3.8.0 # via # -r requirements/edx/kernel.in # ora2 @@ -583,14 +584,14 @@ geoip2==4.8.0 # via -r requirements/edx/kernel.in glob2==0.7 # via -r requirements/edx/kernel.in -google-api-core[grpc]==2.21.0 +google-api-core[grpc]==2.20.0 # via # firebase-admin # google-api-python-client # google-cloud-core # google-cloud-firestore # google-cloud-storage -google-api-python-client==2.149.0 +google-api-python-client==2.147.0 # via firebase-admin google-auth==2.35.0 # via @@ -620,11 +621,11 @@ googleapis-common-protos==1.65.0 # via # google-api-core # grpcio-status -grpcio==1.66.2 +grpcio==1.66.1 # via # google-api-core # grpcio-status -grpcio-status==1.66.2 +grpcio-status==1.66.1 # via google-api-core gunicorn==23.0.0 # via -r requirements/edx/kernel.in @@ -638,7 +639,7 @@ httplib2==0.22.0 # via # google-api-python-client # google-auth-httplib2 -icalendar==6.0.0 +icalendar==5.0.13 # via -r requirements/edx/kernel.in idna==3.10 # via @@ -657,7 +658,7 @@ interchange==2021.0.4 # via py2neo ipaddress==1.0.23 # via -r requirements/edx/kernel.in -isodate==0.7.2 +isodate==0.6.1 # via python3-saml jinja2==3.1.4 # via code-annotations @@ -682,7 +683,7 @@ jsonschema==4.23.0 # via # drf-spectacular # optimizely-sdk -jsonschema-specifications==2024.10.1 +jsonschema-specifications==2023.12.1 # via jsonschema jwcrypto==1.5.6 # via @@ -707,21 +708,19 @@ loremipsum==1.0.5 # via ora2 lti-consumer-xblock==9.11.3 # via -r requirements/edx/kernel.in -lxml[html-clean]==5.3.0 +lxml==4.9.4 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in # edx-i18n-tools # edxval # lti-consumer-xblock - # lxml-html-clean # olxcleaner # openedx-calc # ora2 # python3-saml # xblock # xmlsec -lxml-html-clean==0.3.1 - # via lxml mailsnake==1.6.4 # via -r requirements/edx/bundled.in mako==1.3.5 @@ -738,7 +737,7 @@ markdown==3.3.7 # openedx-django-wiki # staff-graded-xblock # xblock-poll -markupsafe==3.0.1 +markupsafe==2.1.5 # via # -r requirements/edx/paver.txt # chem @@ -770,7 +769,7 @@ multidict==6.1.0 # yarl mysqlclient==2.2.4 # via -r requirements/edx/kernel.in -newrelic==10.0.0 +newrelic==9.13.0 # via # -r requirements/edx/bundled.in # edx-django-utils @@ -821,7 +820,7 @@ openedx-events==9.14.1 # edx-name-affirmation # event-tracking # ora2 -openedx-filters==1.11.0 +openedx-filters==1.10.0 # via # -r requirements/edx/kernel.in # lti-consumer-xblock @@ -830,7 +829,7 @@ openedx-learning==0.13.1 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in -openedx-mongodbproxy==0.2.2 +openedx-mongodbproxy==0.2.1 # via -r requirements/edx/kernel.in optimizely-sdk==4.1.1 # via @@ -882,8 +881,6 @@ polib==1.2.0 # via edx-i18n-tools prompt-toolkit==3.0.48 # via click-repl -propcache==0.2.0 - # via yarl proto-plus==1.24.0 # via # google-api-core @@ -914,7 +911,7 @@ pycountry==24.6.1 # via -r requirements/edx/kernel.in pycparser==2.22 # via cffi -pycryptodomex==3.21.0 +pycryptodomex==3.20.0 # via # -r requirements/edx/kernel.in # edx-proctoring @@ -1020,6 +1017,7 @@ pytz==2024.2 # edx-tincan-py35 # event-tracking # fs + # icalendar # interchange # olxcleaner # ora2 @@ -1041,7 +1039,7 @@ random2==1.0.2 # via -r requirements/edx/kernel.in recommender-xblock==2.2.1 # via -r requirements/edx/bundled.in -redis==5.1.1 +redis==5.0.8 # via # -r requirements/edx/kernel.in # walrus @@ -1094,7 +1092,7 @@ rules==3.5 # edx-enterprise # edx-proctoring # openedx-learning -s3transfer==0.10.3 +s3transfer==0.10.2 # via boto3 sailthru-client==2.2.3 # via edx-ace @@ -1133,6 +1131,7 @@ six==1.16.0 # fs-s3fs # html5lib # interchange + # isodate # libsass # optimizely-sdk # pansi @@ -1209,7 +1208,6 @@ typing-extensions==4.12.2 tzdata==2024.2 # via # celery - # icalendar # kombu unicodecsv==0.14.1 # via @@ -1239,7 +1237,7 @@ voluptuous==0.15.2 # via ora2 walrus==0.9.4 # via edx-event-bus-redis -watchdog==5.0.3 +watchdog==5.0.2 # via -r requirements/edx/paver.txt wcwidth==0.2.13 # via prompt-toolkit @@ -1287,11 +1285,13 @@ xblock-utils==4.0.0 # via # edx-sga # xblock-poll -xmlsec==1.3.14 - # via python3-saml +xmlsec==1.3.13 + # via + # -c requirements/edx/../constraints.txt + # python3-saml xss-utils==0.6.0 # via -r requirements/edx/kernel.in -yarl==1.14.0 +yarl==1.12.1 # via aiohttp zipp==3.20.2 # via importlib-metadata diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index 45f2429cb2d1..a1faf5e74025 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -6,13 +6,13 @@ # chardet==5.2.0 # via diff-cover -coverage==7.6.2 +coverage==7.6.1 # via -r requirements/edx/coverage.in diff-cover==9.2.0 # via -r requirements/edx/coverage.in jinja2==3.1.4 # via diff-cover -markupsafe==3.0.1 +markupsafe==2.1.5 # via jinja2 pluggy==1.5.0 # via diff-cover diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 13f3f6d5e637..1bdd3736516b 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -12,16 +12,16 @@ accessible-pygments==0.0.5 # via # -r requirements/edx/doc.txt # pydata-sphinx-theme -acid-xblock==0.4.1 +acid-xblock==0.3.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -aiohappyeyeballs==2.4.3 +aiohappyeyeballs==2.4.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # aiohttp -aiohttp==3.10.9 +aiohttp==3.10.6 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -140,14 +140,14 @@ boto==2.49.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -boto3==1.35.37 +boto3==1.35.27 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # django-ses # fs-s3fs # ora2 -botocore==1.35.37 +botocore==1.35.27 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -157,7 +157,7 @@ bridgekeeper==0.9 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -build==1.2.2.post1 +build==1.2.2 # via # -r requirements/edx/../pip-tools.txt # pip-tools @@ -172,7 +172,7 @@ cachetools==5.5.0 # -r requirements/edx/testing.txt # google-auth # tox -camel-converter[pydantic]==4.0.1 +camel-converter[pydantic]==3.1.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -278,7 +278,7 @@ colorama==0.4.6 # via # -r requirements/edx/testing.txt # tox -coverage[toml]==7.6.2 +coverage[toml]==7.6.1 # via # -r requirements/edx/testing.txt # pytest-cov @@ -325,11 +325,11 @@ defusedxml==0.7.1 # social-auth-core diff-cover==9.2.0 # via -r requirements/edx/testing.txt -dill==0.3.9 +dill==0.3.8 # via # -r requirements/edx/testing.txt # pylint -distlib==0.3.9 +distlib==0.3.8 # via # -r requirements/edx/testing.txt # virtualenv @@ -544,7 +544,7 @@ django-sekizai==4.1.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # openedx-django-wiki -django-ses==4.2.0 +django-ses==4.1.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -627,7 +627,7 @@ djangorestframework-xml==2.0.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-enterprise -dnspython==2.7.0 +dnspython==2.6.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -696,7 +696,7 @@ edx-codejail==3.4.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-completion==4.7.2 +edx-completion==4.7.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -710,7 +710,7 @@ edx-django-sites-extensions==4.2.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-django-utils==6.0.0 +edx-django-utils==5.16.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -754,8 +754,9 @@ edx-event-bus-redis==0.5.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-i18n-tools==1.6.3 +edx-i18n-tools==1.5.0 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # ora2 @@ -813,7 +814,7 @@ edx-sga==0.25.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-submissions==3.8.1 +edx-submissions==3.8.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -878,7 +879,7 @@ execnet==2.1.1 # pytest-xdist factory-boy==3.3.1 # via -r requirements/edx/testing.txt -faker==30.3.0 +faker==30.0.0 # via # -r requirements/edx/testing.txt # factory-boy @@ -942,7 +943,7 @@ glob2==0.7 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -google-api-core[grpc]==2.21.0 +google-api-core[grpc]==2.20.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -951,7 +952,7 @@ google-api-core[grpc]==2.21.0 # google-cloud-core # google-cloud-firestore # google-cloud-storage -google-api-python-client==2.149.0 +google-api-python-client==2.147.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1004,17 +1005,17 @@ googleapis-common-protos==1.65.0 # -r requirements/edx/testing.txt # google-api-core # grpcio-status -grimp==3.5 +grimp==3.4.1 # via # -r requirements/edx/testing.txt # import-linter -grpcio==1.66.2 +grpcio==1.66.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # google-api-core # grpcio-status -grpcio-status==1.66.2 +grpcio-status==1.66.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1044,7 +1045,7 @@ httplib2==0.22.0 # google-auth-httplib2 httpretty==1.1.4 # via -r requirements/edx/testing.txt -icalendar==6.0.0 +icalendar==5.0.13 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1061,7 +1062,7 @@ imagesize==1.4.1 # via # -r requirements/edx/doc.txt # sphinx -import-linter==2.1 +import-linter==2.0 # via -r requirements/edx/testing.txt importlib-metadata==8.5.0 # via @@ -1086,7 +1087,7 @@ ipaddress==1.0.23 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -isodate==0.7.2 +isodate==0.6.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1135,7 +1136,7 @@ jsonschema==4.23.0 # drf-spectacular # optimizely-sdk # sphinxcontrib-openapi -jsonschema-specifications==2024.10.1 +jsonschema-specifications==2023.12.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1182,14 +1183,14 @@ lti-consumer-xblock==9.11.3 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -lxml[html-clean]==5.3.0 +lxml==4.9.4 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-i18n-tools # edxval # lti-consumer-xblock - # lxml-html-clean # olxcleaner # openedx-calc # ora2 @@ -1197,11 +1198,6 @@ lxml[html-clean]==5.3.0 # python3-saml # xblock # xmlsec -lxml-html-clean==0.3.1 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # lxml mailsnake==1.6.4 # via # -r requirements/edx/doc.txt @@ -1222,7 +1218,7 @@ markdown==3.3.7 # openedx-django-wiki # staff-graded-xblock # xblock-poll -markupsafe==3.0.1 +markupsafe==2.1.5 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1294,7 +1290,7 @@ mysqlclient==2.2.4 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -newrelic==10.0.0 +newrelic==9.13.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1372,7 +1368,7 @@ openedx-events==9.14.1 # edx-name-affirmation # event-tracking # ora2 -openedx-filters==1.11.0 +openedx-filters==1.10.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1383,7 +1379,7 @@ openedx-learning==0.13.1 # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -openedx-mongodbproxy==0.2.2 +openedx-mongodbproxy==0.2.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1411,7 +1407,7 @@ packaging==24.1 # snowflake-connector-python # sphinx # tox -pact-python==2.2.2 +pact-python==2.2.1 # via -r requirements/edx/testing.txt pansi==2020.7.3 # via @@ -1492,11 +1488,6 @@ prompt-toolkit==3.0.48 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # click-repl -propcache==0.2.0 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # yarl proto-plus==1.24.0 # via # -r requirements/edx/doc.txt @@ -1551,7 +1542,7 @@ pycparser==2.22 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # cffi -pycryptodomex==3.21.0 +pycryptodomex==3.20.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1675,7 +1666,7 @@ pyproject-api==1.8.0 # via # -r requirements/edx/testing.txt # tox -pyproject-hooks==1.2.0 +pyproject-hooks==1.1.0 # via # -r requirements/edx/../pip-tools.txt # build @@ -1776,6 +1767,7 @@ pytz==2024.2 # edx-tincan-py35 # event-tracking # fs + # icalendar # interchange # olxcleaner # ora2 @@ -1807,7 +1799,7 @@ recommender-xblock==2.2.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -redis==5.1.1 +redis==5.0.8 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1877,7 +1869,7 @@ rules==3.5 # edx-enterprise # edx-proctoring # openedx-learning -s3transfer==0.10.3 +s3transfer==0.10.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1934,6 +1926,7 @@ six==1.16.0 # fs-s3fs # html5lib # interchange + # isodate # libsass # optimizely-sdk # pact-python @@ -1993,7 +1986,7 @@ soupsieve==2.6 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # beautifulsoup4 -sphinx==8.1.0 +sphinx==8.0.2 # via # -r requirements/edx/doc.txt # pydata-sphinx-theme @@ -2094,7 +2087,7 @@ tinycss2==1.2.1 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # bleach -tomli==2.0.2 +tomli==2.0.1 # via django-stubs tomlkit==0.13.2 # via @@ -2102,7 +2095,7 @@ tomlkit==0.13.2 # -r requirements/edx/testing.txt # pylint # snowflake-connector-python -tox==4.21.2 +tox==4.20.0 # via -r requirements/edx/testing.txt tqdm==4.66.5 # via @@ -2110,7 +2103,7 @@ tqdm==4.66.5 # -r requirements/edx/testing.txt # nltk # openai -types-pytz==2024.2.0.20241003 +types-pytz==2024.2.0.20240913 # via django-stubs types-pyyaml==6.0.12.20240917 # via @@ -2129,7 +2122,6 @@ typing-extensions==4.12.2 # django-stubs-ext # djangorestframework-stubs # edx-opaque-keys - # faker # fastapi # grimp # import-linter @@ -2145,7 +2137,6 @@ tzdata==2024.2 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # celery - # icalendar # kombu unicodecsv==0.14.1 # via @@ -2174,7 +2165,7 @@ user-util==1.1.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -uvicorn==0.31.1 +uvicorn==0.30.6 # via # -r requirements/edx/testing.txt # pact-python @@ -2185,7 +2176,7 @@ vine==5.1.0 # amqp # celery # kombu -virtualenv==20.26.6 +virtualenv==20.26.5 # via # -r requirements/edx/testing.txt # tox @@ -2194,14 +2185,14 @@ voluptuous==0.15.2 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # ora2 -vulture==2.13 +vulture==2.12 # via -r requirements/edx/development.in walrus==0.9.4 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-event-bus-redis -watchdog==5.0.3 +watchdog==5.0.2 # via # -r requirements/edx/development.in # -r requirements/edx/doc.txt @@ -2275,8 +2266,9 @@ xblock-utils==4.0.0 # -r requirements/edx/testing.txt # edx-sga # xblock-poll -xmlsec==1.3.14 +xmlsec==1.3.13 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # python3-saml @@ -2284,7 +2276,7 @@ xss-utils==0.6.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -yarl==1.14.0 +yarl==1.12.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 30736a21a35a..6f12d8046759 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -8,13 +8,13 @@ # via -r requirements/edx/base.txt accessible-pygments==0.0.5 # via pydata-sphinx-theme -acid-xblock==0.4.1 +acid-xblock==0.3.1 # via -r requirements/edx/base.txt -aiohappyeyeballs==2.4.3 +aiohappyeyeballs==2.4.0 # via # -r requirements/edx/base.txt # aiohttp -aiohttp==3.10.9 +aiohttp==3.10.6 # via # -r requirements/edx/base.txt # geoip2 @@ -102,13 +102,13 @@ bleach[css]==6.1.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/base.txt -boto3==1.35.37 +boto3==1.35.27 # via # -r requirements/edx/base.txt # django-ses # fs-s3fs # ora2 -botocore==1.35.37 +botocore==1.35.27 # via # -r requirements/edx/base.txt # boto3 @@ -123,7 +123,7 @@ cachetools==5.5.0 # via # -r requirements/edx/base.txt # google-auth -camel-converter[pydantic]==4.0.1 +camel-converter[pydantic]==3.1.2 # via # -r requirements/edx/base.txt # meilisearch @@ -398,7 +398,7 @@ django-sekizai==4.1.0 # via # -r requirements/edx/base.txt # openedx-django-wiki -django-ses==4.2.0 +django-ses==4.1.1 # via -r requirements/edx/base.txt django-simple-history==3.4.0 # via @@ -459,7 +459,7 @@ djangorestframework-xml==2.0.0 # via # -r requirements/edx/base.txt # edx-enterprise -dnspython==2.7.0 +dnspython==2.6.1 # via # -r requirements/edx/base.txt # pymongo @@ -509,7 +509,7 @@ edx-celeryutils==1.3.0 # super-csv edx-codejail==3.4.1 # via -r requirements/edx/base.txt -edx-completion==4.7.2 +edx-completion==4.7.1 # via -r requirements/edx/base.txt edx-django-release-util==1.4.0 # via @@ -518,7 +518,7 @@ edx-django-release-util==1.4.0 # edxval edx-django-sites-extensions==4.2.0 # via -r requirements/edx/base.txt -edx-django-utils==6.0.0 +edx-django-utils==5.16.0 # via # -r requirements/edx/base.txt # django-config-models @@ -555,8 +555,9 @@ edx-event-bus-kafka==5.8.1 # via -r requirements/edx/base.txt edx-event-bus-redis==0.5.0 # via -r requirements/edx/base.txt -edx-i18n-tools==1.6.3 +edx-i18n-tools==1.5.0 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # ora2 edx-milestones==0.6.0 @@ -597,7 +598,7 @@ edx-search==4.0.0 # via -r requirements/edx/base.txt edx-sga==0.25.0 # via -r requirements/edx/base.txt -edx-submissions==3.8.1 +edx-submissions==3.8.0 # via # -r requirements/edx/base.txt # ora2 @@ -682,7 +683,7 @@ gitpython==3.1.43 # via -r requirements/edx/doc.in glob2==0.7 # via -r requirements/edx/base.txt -google-api-core[grpc]==2.21.0 +google-api-core[grpc]==2.20.0 # via # -r requirements/edx/base.txt # firebase-admin @@ -690,7 +691,7 @@ google-api-core[grpc]==2.21.0 # google-cloud-core # google-cloud-firestore # google-cloud-storage -google-api-python-client==2.149.0 +google-api-python-client==2.147.0 # via # -r requirements/edx/base.txt # firebase-admin @@ -734,12 +735,12 @@ googleapis-common-protos==1.65.0 # -r requirements/edx/base.txt # google-api-core # grpcio-status -grpcio==1.66.2 +grpcio==1.66.1 # via # -r requirements/edx/base.txt # google-api-core # grpcio-status -grpcio-status==1.66.2 +grpcio-status==1.66.1 # via # -r requirements/edx/base.txt # google-api-core @@ -756,7 +757,7 @@ httplib2==0.22.0 # -r requirements/edx/base.txt # google-api-python-client # google-auth-httplib2 -icalendar==6.0.0 +icalendar==5.0.13 # via -r requirements/edx/base.txt idna==3.10 # via @@ -780,7 +781,7 @@ interchange==2021.0.4 # py2neo ipaddress==1.0.23 # via -r requirements/edx/base.txt -isodate==0.7.2 +isodate==0.6.1 # via # -r requirements/edx/base.txt # python3-saml @@ -817,7 +818,7 @@ jsonschema==4.23.0 # drf-spectacular # optimizely-sdk # sphinxcontrib-openapi -jsonschema-specifications==2024.10.1 +jsonschema-specifications==2023.12.1 # via # -r requirements/edx/base.txt # jsonschema @@ -849,23 +850,19 @@ loremipsum==1.0.5 # ora2 lti-consumer-xblock==9.11.3 # via -r requirements/edx/base.txt -lxml[html-clean]==5.3.0 +lxml==4.9.4 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-i18n-tools # edxval # lti-consumer-xblock - # lxml-html-clean # olxcleaner # openedx-calc # ora2 # python3-saml # xblock # xmlsec -lxml-html-clean==0.3.1 - # via - # -r requirements/edx/base.txt - # lxml mailsnake==1.6.4 # via -r requirements/edx/base.txt mako==1.3.5 @@ -882,7 +879,7 @@ markdown==3.3.7 # openedx-django-wiki # staff-graded-xblock # xblock-poll -markupsafe==3.0.1 +markupsafe==2.1.5 # via # -r requirements/edx/base.txt # chem @@ -926,7 +923,7 @@ multidict==6.1.0 # yarl mysqlclient==2.2.4 # via -r requirements/edx/base.txt -newrelic==10.0.0 +newrelic==9.13.0 # via # -r requirements/edx/base.txt # edx-django-utils @@ -982,7 +979,7 @@ openedx-events==9.14.1 # edx-name-affirmation # event-tracking # ora2 -openedx-filters==1.11.0 +openedx-filters==1.10.0 # via # -r requirements/edx/base.txt # lti-consumer-xblock @@ -991,7 +988,7 @@ openedx-learning==0.13.1 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt -openedx-mongodbproxy==0.2.2 +openedx-mongodbproxy==0.2.1 # via -r requirements/edx/base.txt optimizely-sdk==4.1.1 # via @@ -1060,10 +1057,6 @@ prompt-toolkit==3.0.48 # via # -r requirements/edx/base.txt # click-repl -propcache==0.2.0 - # via - # -r requirements/edx/base.txt - # yarl proto-plus==1.24.0 # via # -r requirements/edx/base.txt @@ -1101,7 +1094,7 @@ pycparser==2.22 # via # -r requirements/edx/base.txt # cffi -pycryptodomex==3.21.0 +pycryptodomex==3.20.0 # via # -r requirements/edx/base.txt # edx-proctoring @@ -1229,6 +1222,7 @@ pytz==2024.2 # edx-tincan-py35 # event-tracking # fs + # icalendar # interchange # olxcleaner # ora2 @@ -1251,7 +1245,7 @@ random2==1.0.2 # via -r requirements/edx/base.txt recommender-xblock==2.2.1 # via -r requirements/edx/base.txt -redis==5.1.1 +redis==5.0.8 # via # -r requirements/edx/base.txt # walrus @@ -1311,7 +1305,7 @@ rules==3.5 # edx-enterprise # edx-proctoring # openedx-learning -s3transfer==0.10.3 +s3transfer==0.10.2 # via # -r requirements/edx/base.txt # boto3 @@ -1356,6 +1350,7 @@ six==1.16.0 # fs-s3fs # html5lib # interchange + # isodate # libsass # optimizely-sdk # pansi @@ -1399,7 +1394,7 @@ soupsieve==2.6 # via # -r requirements/edx/base.txt # beautifulsoup4 -sphinx==8.1.0 +sphinx==8.0.2 # via # -r requirements/edx/doc.in # pydata-sphinx-theme @@ -1494,7 +1489,6 @@ tzdata==2024.2 # via # -r requirements/edx/base.txt # celery - # icalendar # kombu unicodecsv==0.14.1 # via @@ -1530,7 +1524,7 @@ walrus==0.9.4 # via # -r requirements/edx/base.txt # edx-event-bus-redis -watchdog==5.0.3 +watchdog==5.0.2 # via -r requirements/edx/base.txt wcwidth==0.2.13 # via @@ -1582,13 +1576,14 @@ xblock-utils==4.0.0 # -r requirements/edx/base.txt # edx-sga # xblock-poll -xmlsec==1.3.14 +xmlsec==1.3.13 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # python3-saml xss-utils==0.6.0 # via -r requirements/edx/base.txt -yarl==1.14.0 +yarl==1.12.1 # via # -r requirements/edx/base.txt # aiohttp diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 2d8f510e0307..a0b1896919d4 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -10,7 +10,7 @@ charset-normalizer==2.0.12 # via # -c requirements/edx/../constraints.txt # requests -dnspython==2.7.0 +dnspython==2.6.1 # via pymongo edx-opaque-keys==2.11.0 # via -r requirements/edx/paver.in @@ -22,7 +22,7 @@ libsass==0.10.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/paver.in -markupsafe==3.0.1 +markupsafe==2.1.5 # via -r requirements/edx/paver.in mock==5.1.0 # via -r requirements/edx/paver.in @@ -61,7 +61,7 @@ urllib3==1.26.20 # via # -c requirements/edx/../constraints.txt # requests -watchdog==5.0.3 +watchdog==5.0.2 # via -r requirements/edx/paver.in wrapt==1.16.0 # via -r requirements/edx/paver.in diff --git a/requirements/edx/semgrep.txt b/requirements/edx/semgrep.txt index 174fa87d081d..102289def277 100644 --- a/requirements/edx/semgrep.txt +++ b/requirements/edx/semgrep.txt @@ -15,7 +15,7 @@ boltons==21.0.0 # face # glom # semgrep -bracex==2.5.post1 +bracex==2.5 # via wcmatch certifi==2024.8.30 # via requests @@ -42,7 +42,7 @@ idna==3.10 # via requests jsonschema==4.23.0 # via semgrep -jsonschema-specifications==2024.10.1 +jsonschema-specifications==2023.12.1 # via jsonschema markdown-it-py==3.0.0 # via rich @@ -60,7 +60,7 @@ referencing==0.35.1 # jsonschema-specifications requests==2.32.3 # via semgrep -rich==13.9.2 +rich==13.8.1 # via semgrep rpds-py==0.20.0 # via @@ -72,7 +72,7 @@ ruamel-yaml-clib==0.2.8 # via ruamel-yaml semgrep==1.52.0 # via -r requirements/edx/semgrep.in -tomli==2.0.2 +tomli==2.0.1 # via semgrep typing-extensions==4.12.2 # via semgrep diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 473da125341f..d3b14a6f4373 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -6,13 +6,13 @@ # -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/base.txt -acid-xblock==0.4.1 +acid-xblock==0.3.1 # via -r requirements/edx/base.txt -aiohappyeyeballs==2.4.3 +aiohappyeyeballs==2.4.0 # via # -r requirements/edx/base.txt # aiohttp -aiohttp==3.10.9 +aiohttp==3.10.6 # via # -r requirements/edx/base.txt # geoip2 @@ -102,13 +102,13 @@ bleach[css]==6.1.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/base.txt -boto3==1.35.37 +boto3==1.35.27 # via # -r requirements/edx/base.txt # django-ses # fs-s3fs # ora2 -botocore==1.35.37 +botocore==1.35.27 # via # -r requirements/edx/base.txt # boto3 @@ -124,7 +124,7 @@ cachetools==5.5.0 # -r requirements/edx/base.txt # google-auth # tox -camel-converter[pydantic]==4.0.1 +camel-converter[pydantic]==3.1.2 # via # -r requirements/edx/base.txt # meilisearch @@ -209,7 +209,7 @@ codejail-includes==1.0.0 # via -r requirements/edx/base.txt colorama==0.4.6 # via tox -coverage[toml]==7.6.2 +coverage[toml]==7.6.1 # via # -r requirements/edx/coverage.txt # pytest-cov @@ -247,9 +247,9 @@ defusedxml==0.7.1 # social-auth-core diff-cover==9.2.0 # via -r requirements/edx/coverage.txt -dill==0.3.9 +dill==0.3.8 # via pylint -distlib==0.3.9 +distlib==0.3.8 # via virtualenv django==4.2.16 # via @@ -427,7 +427,7 @@ django-sekizai==4.1.0 # via # -r requirements/edx/base.txt # openedx-django-wiki -django-ses==4.2.0 +django-ses==4.1.1 # via -r requirements/edx/base.txt django-simple-history==3.4.0 # via @@ -488,7 +488,7 @@ djangorestframework-xml==2.0.0 # via # -r requirements/edx/base.txt # edx-enterprise -dnspython==2.7.0 +dnspython==2.6.1 # via # -r requirements/edx/base.txt # pymongo @@ -533,7 +533,7 @@ edx-celeryutils==1.3.0 # super-csv edx-codejail==3.4.1 # via -r requirements/edx/base.txt -edx-completion==4.7.2 +edx-completion==4.7.1 # via -r requirements/edx/base.txt edx-django-release-util==1.4.0 # via @@ -542,7 +542,7 @@ edx-django-release-util==1.4.0 # edxval edx-django-sites-extensions==4.2.0 # via -r requirements/edx/base.txt -edx-django-utils==6.0.0 +edx-django-utils==5.16.0 # via # -r requirements/edx/base.txt # django-config-models @@ -579,8 +579,9 @@ edx-event-bus-kafka==5.8.1 # via -r requirements/edx/base.txt edx-event-bus-redis==0.5.0 # via -r requirements/edx/base.txt -edx-i18n-tools==1.6.3 +edx-i18n-tools==1.5.0 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # ora2 edx-lint==5.4.0 @@ -623,7 +624,7 @@ edx-search==4.0.0 # via -r requirements/edx/base.txt edx-sga==0.25.0 # via -r requirements/edx/base.txt -edx-submissions==3.8.1 +edx-submissions==3.8.0 # via # -r requirements/edx/base.txt # ora2 @@ -673,7 +674,7 @@ execnet==2.1.1 # via pytest-xdist factory-boy==3.3.1 # via -r requirements/edx/testing.in -faker==30.3.0 +faker==30.0.0 # via factory-boy fastapi==0.115.0 # via pact-python @@ -716,7 +717,7 @@ geoip2==4.8.0 # via -r requirements/edx/base.txt glob2==0.7 # via -r requirements/edx/base.txt -google-api-core[grpc]==2.21.0 +google-api-core[grpc]==2.20.0 # via # -r requirements/edx/base.txt # firebase-admin @@ -724,7 +725,7 @@ google-api-core[grpc]==2.21.0 # google-cloud-core # google-cloud-firestore # google-cloud-storage -google-api-python-client==2.149.0 +google-api-python-client==2.147.0 # via # -r requirements/edx/base.txt # firebase-admin @@ -768,14 +769,14 @@ googleapis-common-protos==1.65.0 # -r requirements/edx/base.txt # google-api-core # grpcio-status -grimp==3.5 +grimp==3.4.1 # via import-linter -grpcio==1.66.2 +grpcio==1.66.1 # via # -r requirements/edx/base.txt # google-api-core # grpcio-status -grpcio-status==1.66.2 +grpcio-status==1.66.1 # via # -r requirements/edx/base.txt # google-api-core @@ -796,7 +797,7 @@ httplib2==0.22.0 # google-auth-httplib2 httpretty==1.1.4 # via -r requirements/edx/testing.in -icalendar==6.0.0 +icalendar==5.0.13 # via -r requirements/edx/base.txt idna==3.10 # via @@ -806,7 +807,7 @@ idna==3.10 # requests # snowflake-connector-python # yarl -import-linter==2.1 +import-linter==2.0 # via -r requirements/edx/testing.in importlib-metadata==8.5.0 # via -r requirements/edx/base.txt @@ -823,7 +824,7 @@ interchange==2021.0.4 # py2neo ipaddress==1.0.23 # via -r requirements/edx/base.txt -isodate==0.7.2 +isodate==0.6.1 # via # -r requirements/edx/base.txt # python3-saml @@ -864,7 +865,7 @@ jsonschema==4.23.0 # -r requirements/edx/base.txt # drf-spectacular # optimizely-sdk -jsonschema-specifications==2024.10.1 +jsonschema-specifications==2023.12.1 # via # -r requirements/edx/base.txt # jsonschema @@ -898,13 +899,13 @@ loremipsum==1.0.5 # ora2 lti-consumer-xblock==9.11.3 # via -r requirements/edx/base.txt -lxml[html-clean]==5.3.0 +lxml==4.9.4 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-i18n-tools # edxval # lti-consumer-xblock - # lxml-html-clean # olxcleaner # openedx-calc # ora2 @@ -912,10 +913,6 @@ lxml[html-clean]==5.3.0 # python3-saml # xblock # xmlsec -lxml-html-clean==0.3.1 - # via - # -r requirements/edx/base.txt - # lxml mailsnake==1.6.4 # via -r requirements/edx/base.txt mako==1.3.5 @@ -932,7 +929,7 @@ markdown==3.3.7 # openedx-django-wiki # staff-graded-xblock # xblock-poll -markupsafe==3.0.1 +markupsafe==2.1.5 # via # -r requirements/edx/base.txt # -r requirements/edx/coverage.txt @@ -977,7 +974,7 @@ multidict==6.1.0 # yarl mysqlclient==2.2.4 # via -r requirements/edx/base.txt -newrelic==10.0.0 +newrelic==9.13.0 # via # -r requirements/edx/base.txt # edx-django-utils @@ -1033,7 +1030,7 @@ openedx-events==9.14.1 # edx-name-affirmation # event-tracking # ora2 -openedx-filters==1.11.0 +openedx-filters==1.10.0 # via # -r requirements/edx/base.txt # lti-consumer-xblock @@ -1042,7 +1039,7 @@ openedx-learning==0.13.1 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt -openedx-mongodbproxy==0.2.2 +openedx-mongodbproxy==0.2.1 # via -r requirements/edx/base.txt optimizely-sdk==4.1.1 # via @@ -1060,7 +1057,7 @@ packaging==24.1 # pytest # snowflake-connector-python # tox -pact-python==2.2.2 +pact-python==2.2.1 # via -r requirements/edx/testing.in pansi==2020.7.3 # via @@ -1122,10 +1119,6 @@ prompt-toolkit==3.0.48 # via # -r requirements/edx/base.txt # click-repl -propcache==0.2.0 - # via - # -r requirements/edx/base.txt - # yarl proto-plus==1.24.0 # via # -r requirements/edx/base.txt @@ -1171,7 +1164,7 @@ pycparser==2.22 # via # -r requirements/edx/base.txt # cffi -pycryptodomex==3.21.0 +pycryptodomex==3.20.0 # via # -r requirements/edx/base.txt # edx-proctoring @@ -1347,6 +1340,7 @@ pytz==2024.2 # edx-tincan-py35 # event-tracking # fs + # icalendar # interchange # olxcleaner # ora2 @@ -1368,7 +1362,7 @@ random2==1.0.2 # via -r requirements/edx/base.txt recommender-xblock==2.2.1 # via -r requirements/edx/base.txt -redis==5.1.1 +redis==5.0.8 # via # -r requirements/edx/base.txt # walrus @@ -1428,7 +1422,7 @@ rules==3.5 # edx-enterprise # edx-proctoring # openedx-learning -s3transfer==0.10.3 +s3transfer==0.10.2 # via # -r requirements/edx/base.txt # boto3 @@ -1476,6 +1470,7 @@ six==1.16.0 # fs-s3fs # html5lib # interchange + # isodate # libsass # optimizely-sdk # pact-python @@ -1559,7 +1554,7 @@ tomlkit==0.13.2 # -r requirements/edx/base.txt # pylint # snowflake-connector-python -tox==4.21.2 +tox==4.20.0 # via -r requirements/edx/testing.in tqdm==4.66.5 # via @@ -1571,7 +1566,6 @@ typing-extensions==4.12.2 # -r requirements/edx/base.txt # django-countries # edx-opaque-keys - # faker # fastapi # grimp # import-linter @@ -1584,7 +1578,6 @@ tzdata==2024.2 # via # -r requirements/edx/base.txt # celery - # icalendar # kombu unicodecsv==0.14.1 # via @@ -1608,7 +1601,7 @@ urllib3==1.26.20 # requests user-util==1.1.0 # via -r requirements/edx/base.txt -uvicorn==0.31.1 +uvicorn==0.30.6 # via pact-python vine==5.1.0 # via @@ -1616,7 +1609,7 @@ vine==5.1.0 # amqp # celery # kombu -virtualenv==20.26.6 +virtualenv==20.26.5 # via tox voluptuous==0.15.2 # via @@ -1626,7 +1619,7 @@ walrus==0.9.4 # via # -r requirements/edx/base.txt # edx-event-bus-redis -watchdog==5.0.3 +watchdog==5.0.2 # via -r requirements/edx/base.txt wcwidth==0.2.13 # via @@ -1680,13 +1673,14 @@ xblock-utils==4.0.0 # -r requirements/edx/base.txt # edx-sga # xblock-poll -xmlsec==1.3.14 +xmlsec==1.3.13 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # python3-saml xss-utils==0.6.0 # via -r requirements/edx/base.txt -yarl==1.14.0 +yarl==1.12.1 # via # -r requirements/edx/base.txt # aiohttp diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 110663ff6ab3..5bcb2aa55084 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,7 +4,7 @@ # # make upgrade # -build==1.2.2.post1 +build==1.2.2 # via pip-tools click==8.1.6 # via @@ -14,7 +14,7 @@ packaging==24.1 # via build pip-tools==7.4.1 # via -r requirements/pip-tools.in -pyproject-hooks==1.2.0 +pyproject-hooks==1.1.0 # via # build # pip-tools diff --git a/scripts/structures_pruning/requirements/base.txt b/scripts/structures_pruning/requirements/base.txt index a3fcacad2f7e..b80c660b8749 100644 --- a/scripts/structures_pruning/requirements/base.txt +++ b/scripts/structures_pruning/requirements/base.txt @@ -11,7 +11,7 @@ click==8.1.6 # click-log click-log==0.4.0 # via -r scripts/structures_pruning/requirements/base.in -dnspython==2.7.0 +dnspython==2.6.1 # via pymongo edx-opaque-keys==2.11.0 # via -r scripts/structures_pruning/requirements/base.in diff --git a/scripts/structures_pruning/requirements/testing.txt b/scripts/structures_pruning/requirements/testing.txt index 94c6ac6982f3..8be2e15973d0 100644 --- a/scripts/structures_pruning/requirements/testing.txt +++ b/scripts/structures_pruning/requirements/testing.txt @@ -12,7 +12,7 @@ click-log==0.4.0 # via -r scripts/structures_pruning/requirements/base.txt ddt==1.7.2 # via -r scripts/structures_pruning/requirements/testing.in -dnspython==2.7.0 +dnspython==2.6.1 # via # -r scripts/structures_pruning/requirements/base.txt # pymongo diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt index 576fa342c385..9f57da73d0c2 100644 --- a/scripts/user_retirement/requirements/base.txt +++ b/scripts/user_retirement/requirements/base.txt @@ -10,9 +10,9 @@ attrs==24.2.0 # via zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.in -boto3==1.35.37 +boto3==1.35.27 # via -r scripts/user_retirement/requirements/base.in -botocore==1.35.37 +botocore==1.35.27 # via # boto3 # s3transfer @@ -46,13 +46,13 @@ django-crum==0.7.9 # via edx-django-utils django-waffle==4.1.0 # via edx-django-utils -edx-django-utils==6.0.0 +edx-django-utils==5.16.0 # via edx-rest-api-client edx-rest-api-client==6.0.0 # via -r scripts/user_retirement/requirements/base.in -google-api-core==2.21.0 +google-api-core==2.20.0 # via google-api-python-client -google-api-python-client==2.149.0 +google-api-python-client==2.147.0 # via -r scripts/user_retirement/requirements/base.in google-auth==2.35.0 # via @@ -69,7 +69,7 @@ httplib2==0.22.0 # google-auth-httplib2 idna==3.10 # via requests -isodate==0.7.2 +isodate==0.6.1 # via zeep jenkinsapi==0.3.13 # via -r scripts/user_retirement/requirements/base.in @@ -77,11 +77,13 @@ jmespath==1.0.1 # via # boto3 # botocore -lxml==5.3.0 - # via zeep +lxml==4.9.4 + # via + # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt + # zeep more-itertools==10.5.0 # via simple-salesforce -newrelic==10.0.0 +newrelic==9.13.0 # via edx-django-utils pbr==6.1.0 # via stevedore @@ -136,7 +138,7 @@ requests-toolbelt==1.0.0 # via zeep rsa==4.9 # via google-auth -s3transfer==0.10.3 +s3transfer==0.10.2 # via boto3 simple-salesforce==1.12.6 # via -r scripts/user_retirement/requirements/base.in @@ -144,6 +146,7 @@ simplejson==3.19.3 # via -r scripts/user_retirement/requirements/base.in six==1.16.0 # via + # isodate # jenkinsapi # python-dateutil sqlparse==0.5.1 diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt index 6a165d7356ca..d5aac1cd062f 100644 --- a/scripts/user_retirement/requirements/testing.txt +++ b/scripts/user_retirement/requirements/testing.txt @@ -14,11 +14,11 @@ attrs==24.2.0 # zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.txt -boto3==1.35.37 +boto3==1.35.27 # via # -r scripts/user_retirement/requirements/base.txt # moto -botocore==1.35.37 +botocore==1.35.27 # via # -r scripts/user_retirement/requirements/base.txt # boto3 @@ -66,17 +66,17 @@ django-waffle==4.1.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -edx-django-utils==6.0.0 +edx-django-utils==5.16.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-rest-api-client edx-rest-api-client==6.0.0 # via -r scripts/user_retirement/requirements/base.txt -google-api-core==2.21.0 +google-api-core==2.20.0 # via # -r scripts/user_retirement/requirements/base.txt # google-api-python-client -google-api-python-client==2.149.0 +google-api-python-client==2.147.0 # via -r scripts/user_retirement/requirements/base.txt google-auth==2.35.0 # via @@ -103,7 +103,7 @@ idna==3.10 # requests iniconfig==2.0.0 # via pytest -isodate==0.7.2 +isodate==0.6.1 # via # -r scripts/user_retirement/requirements/base.txt # zeep @@ -116,11 +116,11 @@ jmespath==1.0.1 # -r scripts/user_retirement/requirements/base.txt # boto3 # botocore -lxml==5.3.0 +lxml==4.9.4 # via # -r scripts/user_retirement/requirements/base.txt # zeep -markupsafe==3.0.1 +markupsafe==2.1.5 # via # jinja2 # werkzeug @@ -132,7 +132,7 @@ more-itertools==10.5.0 # simple-salesforce moto==4.2.14 # via -r scripts/user_retirement/requirements/testing.in -newrelic==10.0.0 +newrelic==9.13.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils @@ -235,7 +235,7 @@ rsa==4.9 # via # -r scripts/user_retirement/requirements/base.txt # google-auth -s3transfer==0.10.3 +s3transfer==0.10.2 # via # -r scripts/user_retirement/requirements/base.txt # boto3 @@ -246,6 +246,7 @@ simplejson==3.19.3 six==1.16.0 # via # -r scripts/user_retirement/requirements/base.txt + # isodate # jenkinsapi # python-dateutil sqlparse==0.5.1 @@ -274,7 +275,7 @@ urllib3==1.26.20 # responses werkzeug==3.0.4 # via moto -xmltodict==0.14.1 +xmltodict==0.13.0 # via moto zeep==4.2.1 # via From 7dfb0194c3066a01530d2e235b18560ac2614b4b Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Thu, 10 Oct 2024 16:21:17 -0400 Subject: [PATCH 2/3] Revert "feat: Use jammy repositories for mongo installation." This reverts commit a245dec4f4ff431b336832174f53421a5a1b987c. --- .github/workflows/unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 900489256ab5..5fef1c8352ce 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -94,7 +94,7 @@ jobs: run: | if [[ "${{ matrix.mongo-version }}" != "4.4" ]]; then wget -qO - https://www.mongodb.org/static/pgp/server-${{ matrix.mongo-version }}.asc | sudo apt-key add - - echo "deb https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/${{ matrix.mongo-version }} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-${{ matrix.mongo-version }}.list + echo "deb https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/${{ matrix.mongo-version }} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-${{ matrix.mongo-version }}.list sudo apt-get update && sudo apt-get install -y mongodb-org="${{ matrix.mongo-version }}.*" fi From ff916691d7cb725b93b3f9f130a1debaee6be448 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Thu, 10 Oct 2024 16:36:02 -0400 Subject: [PATCH 3/3] fix: Pin select jobs to ubuntu 22.04. Using Ubuntu 24.04 breaks Mongo installation and some thing involving lxml/xmlsec. We are going to pin this until we're ready to upgrade both. --- .github/workflows/ci-static-analysis.yml | 2 +- .github/workflows/migrations-check.yml | 4 ++-- .github/workflows/pylint-checks.yml | 4 ++-- .github/workflows/quality-checks.yml | 2 +- .github/workflows/static-assets-check.yml | 2 +- .github/workflows/unit-tests.yml | 12 ++++++------ 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci-static-analysis.yml b/.github/workflows/ci-static-analysis.yml index a3b0527aad72..458e00fc6b1f 100644 --- a/.github/workflows/ci-static-analysis.yml +++ b/.github/workflows/ci-static-analysis.yml @@ -10,7 +10,7 @@ jobs: matrix: python-version: - "3.11" - os: ["ubuntu-latest"] + os: ["ubuntu-22.04"] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/migrations-check.yml b/.github/workflows/migrations-check.yml index f253d48e4f41..624caddd5309 100644 --- a/.github/workflows/migrations-check.yml +++ b/.github/workflows/migrations-check.yml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] python-version: - "3.11" # 'pinned' is used to install the latest patch version of Django @@ -126,7 +126,7 @@ jobs: if: always() needs: - check_migrations - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Decide whether the needed jobs succeeded or failed # uses: re-actors/alls-green@v1.2.1 diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml index 144cc77a3da4..ad3aad388780 100644 --- a/.github/workflows/pylint-checks.yml +++ b/.github/workflows/pylint-checks.yml @@ -8,7 +8,7 @@ on: jobs: run-pylint: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: @@ -75,7 +75,7 @@ jobs: if: always() needs: - run-pylint - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Decide whether the needed jobs succeeded or failed # uses: re-actors/alls-green@v1.2.1 diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml index 5445d70e3b4b..84610123493c 100644 --- a/.github/workflows/quality-checks.yml +++ b/.github/workflows/quality-checks.yml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] python-version: - "3.11" node-version: [20] diff --git a/.github/workflows/static-assets-check.yml b/.github/workflows/static-assets-check.yml index 0a417f9b1c79..4fe66e2a7778 100644 --- a/.github/workflows/static-assets-check.yml +++ b/.github/workflows/static-assets-check.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] python-version: - "3.11" node-version: [18, 20] diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 5fef1c8352ce..854677b93cff 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -15,7 +15,7 @@ concurrency: jobs: run-tests: name: ${{ matrix.shard_name }}(py=${{ matrix.python-version }},dj=${{ matrix.django-version }},mongo=${{ matrix.mongo-version }}) - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: python-version: @@ -164,7 +164,7 @@ jobs: overwrite: true collect-and-verify: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Setup Python @@ -229,7 +229,7 @@ jobs: # https://github.com/orgs/community/discussions/33579 success: name: Unit tests successful - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: always() needs: [run-tests] steps: @@ -240,7 +240,7 @@ jobs: jobs: ${{ toJSON(needs) }} compile-warnings-report: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [run-tests] steps: - uses: actions/checkout@v4 @@ -268,7 +268,7 @@ jobs: overwrite: true merge-artifacts: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [compile-warnings-report] steps: - name: Merge Pytest Warnings JSON Artifacts @@ -288,7 +288,7 @@ jobs: # Combine and upload coverage reports. coverage: if: (github.repository == 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == false)) - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [run-tests] strategy: matrix: