diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt index cb224e498823..401f74cef400 100644 --- a/requirements/edx-sandbox/base.txt +++ b/requirements/edx-sandbox/base.txt @@ -20,11 +20,7 @@ cryptography==44.0.0 # via -r requirements/edx-sandbox/base.in cycler==0.12.1 # via matplotlib -<<<<<<< HEAD -fonttools==4.55.0 -======= -fonttools==4.55.2 ->>>>>>> master +fonttools==4.55.3 # via matplotlib joblib==1.4.2 # via nltk @@ -41,7 +37,7 @@ markupsafe==3.0.2 # via # chem # openedx-calc -matplotlib==3.9.3 +matplotlib==3.10.0 # via -r requirements/edx-sandbox/base.in mpmath==1.3.0 # via sympy @@ -92,9 +88,5 @@ sympy==1.13.3 # via # -r requirements/edx-sandbox/base.in # openedx-calc -<<<<<<< HEAD -tqdm==4.67.0 -======= tqdm==4.67.1 ->>>>>>> master # via nltk diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 0ea205b6de4e..b03843d02d05 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -10,15 +10,11 @@ acid-xblock==0.4.1 # via -r requirements/edx/kernel.in aiohappyeyeballs==2.4.4 # via aiohttp -<<<<<<< HEAD -aiohttp==3.11.4 -======= -aiohttp==3.11.9 ->>>>>>> master +aiohttp==3.11.10 # via # geoip2 # openai -aiosignal==1.3.1 +aiosignal==1.3.2 # via aiohttp algoliasearch==3.0.0 # via @@ -76,21 +72,13 @@ bleach[css]==6.2.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/kernel.in -<<<<<<< HEAD -boto3==1.35.64 -======= -boto3==1.35.76 ->>>>>>> master +boto3==1.35.81 # via # -r requirements/edx/kernel.in # django-ses # fs-s3fs # ora2 -<<<<<<< HEAD -botocore==1.35.64 -======= -botocore==1.35.76 ->>>>>>> master +botocore==1.35.81 # via # -r requirements/edx/kernel.in # boto3 @@ -113,7 +101,7 @@ celery==5.4.0 # edx-enterprise # event-tracking # openedx-learning -certifi==2024.8.30 +certifi==2024.12.14 # via # -r requirements/edx/paver.txt # elasticsearch @@ -152,11 +140,7 @@ click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -<<<<<<< HEAD -code-annotations==1.8.1 -======= -code-annotations==2.0.0 ->>>>>>> master +code-annotations==2.1.0 # via # edx-enterprise # edx-toggles @@ -337,7 +321,7 @@ django-oauth-toolkit==1.7.1 # edx-enterprise django-object-actions==4.3.0 # via edx-enterprise -django-pipeline==3.1.0 +django-pipeline==4.0.0 # via -r requirements/edx/kernel.in django-push-notifications==3.1.0 # via edx-ace @@ -347,7 +331,7 @@ django-sekizai==4.1.0 # via # -r requirements/edx/kernel.in # openedx-django-wiki -django-ses==4.3.0 +django-ses==4.3.1 # via -r requirements/edx/bundled.in django-simple-history==3.4.0 # via @@ -450,7 +434,7 @@ edx-celeryutils==1.3.0 # super-csv edx-codejail==3.5.2 # via -r requirements/edx/kernel.in -edx-completion==4.7.6 +edx-completion==4.7.7 # via -r requirements/edx/kernel.in edx-django-release-util==1.4.0 # via @@ -524,7 +508,7 @@ edx-opaque-keys[django]==2.11.0 # ora2 edx-organizations==6.13.0 # via -r requirements/edx/kernel.in -edx-proctoring==4.18.4 +edx-proctoring==5.0.1 # via # -r requirements/edx/kernel.in # edx-proctoring-proctortrack @@ -541,7 +525,7 @@ edx-search==4.1.1 # openedx-forum edx-sga==0.25.0 # via -r requirements/edx/bundled.in -edx-submissions==3.8.3 +edx-submissions==3.8.4 # via # -r requirements/edx/kernel.in # ora2 @@ -609,20 +593,16 @@ geoip2==4.8.1 # via -r requirements/edx/kernel.in glob2==0.7 # via -r requirements/edx/kernel.in -google-api-core[grpc]==2.23.0 +google-api-core[grpc]==2.24.0 # via # firebase-admin # google-api-python-client # google-cloud-core # google-cloud-firestore # google-cloud-storage -<<<<<<< HEAD -google-api-python-client==2.153.0 -======= -google-api-python-client==2.154.0 ->>>>>>> master +google-api-python-client==2.155.0 # via firebase-admin -google-auth==2.36.0 +google-auth==2.37.0 # via # google-api-core # google-api-python-client @@ -650,19 +630,11 @@ googleapis-common-protos==1.66.0 # via # google-api-core # grpcio-status -<<<<<<< HEAD -grpcio==1.68.0 - # via - # google-api-core - # grpcio-status -grpcio-status==1.68.0 -======= grpcio==1.68.1 # via # google-api-core # grpcio-status grpcio-status==1.68.1 ->>>>>>> master # via google-api-core gunicorn==23.0.0 # via -r requirements/edx/kernel.in @@ -762,7 +734,7 @@ lxml-html-clean==0.4.1 # via lxml mailsnake==1.6.4 # via -r requirements/edx/bundled.in -mako==1.3.7 +mako==1.3.8 # via # -r requirements/edx/kernel.in # acid-xblock @@ -809,15 +781,10 @@ multidict==6.1.0 # aiohttp # yarl mysqlclient==2.2.6 -<<<<<<< HEAD - # via -r requirements/edx/kernel.in -newrelic==10.3.0 -======= # via # -r requirements/edx/kernel.in # openedx-forum -newrelic==10.3.1 ->>>>>>> master +newrelic==10.4.0 # via edx-django-utils nh3==0.2.19 # via -r requirements/edx/kernel.in @@ -869,7 +836,7 @@ openedx-events==9.15.0 # edx-name-affirmation # event-tracking # ora2 -openedx-filters==1.11.0 +openedx-filters==1.12.0 # via # -r requirements/edx/kernel.in # lti-consumer-xblock @@ -886,7 +853,7 @@ optimizely-sdk==4.1.1 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/bundled.in -ora2==6.14.1 +ora2==6.14.2 # via -r requirements/edx/bundled.in packaging==24.2 # via @@ -933,11 +900,7 @@ polib==1.2.0 # via edx-i18n-tools prompt-toolkit==3.0.48 # via click-repl -<<<<<<< HEAD -propcache==0.2.0 -======= propcache==0.2.1 ->>>>>>> master # via # aiohttp # yarl @@ -990,11 +953,7 @@ pyjwkest==1.4.2 # -r requirements/edx/kernel.in # edx-token-utils # lti-consumer-xblock -<<<<<<< HEAD -pyjwt[crypto]==2.10.0 -======= pyjwt[crypto]==2.10.1 ->>>>>>> master # via # -r requirements/edx/kernel.in # drf-jwt @@ -1103,7 +1062,7 @@ random2==1.0.2 # via -r requirements/edx/kernel.in recommender-xblock==3.0.0 # via -r requirements/edx/bundled.in -redis==5.2.0 +redis==5.2.1 # via # -r requirements/edx/kernel.in # walrus @@ -1145,11 +1104,7 @@ requests-oauthlib==2.0.0 # via # -r requirements/edx/kernel.in # social-auth-core -<<<<<<< HEAD -rpds-py==0.21.0 -======= rpds-py==0.22.3 ->>>>>>> master # via # jsonschema # referencing @@ -1232,7 +1187,7 @@ sortedcontainers==2.4.0 # snowflake-connector-python soupsieve==2.6 # via beautifulsoup4 -sqlparse==0.5.2 +sqlparse==0.5.3 # via django staff-graded-xblock==2.3.0 # via -r requirements/edx/bundled.in @@ -1257,11 +1212,7 @@ tinycss2==1.4.0 # via bleach tomlkit==0.13.2 # via snowflake-connector-python -<<<<<<< HEAD -tqdm==4.67.0 -======= tqdm==4.67.1 ->>>>>>> master # via # nltk # openai @@ -1328,6 +1279,8 @@ webob==1.8.9 # via # -r requirements/edx/kernel.in # xblock +wheel==0.45.1 + # via django-pipeline wrapt==1.17.0 # via -r requirements/edx/paver.txt xblock[django]==5.1.0 @@ -1362,11 +1315,7 @@ xmlsec==1.3.14 # via python3-saml xss-utils==0.6.0 # via -r requirements/edx/kernel.in -<<<<<<< HEAD -yarl==1.17.2 -======= yarl==1.18.3 ->>>>>>> master # via aiohttp zipp==3.21.0 # via importlib-metadata diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index 24caf4178a9e..23a32bde5e5c 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -6,13 +6,9 @@ # chardet==5.2.0 # via diff-cover -<<<<<<< HEAD -coverage==7.6.7 -======= -coverage==7.6.8 ->>>>>>> master +coverage==7.6.9 # via -r requirements/edx/coverage.in -diff-cover==9.2.0 +diff-cover==9.2.1 # via -r requirements/edx/coverage.in jinja2==3.1.4 # via diff-cover diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index a43bb3dc0f45..216acaab3e0b 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -21,17 +21,13 @@ aiohappyeyeballs==2.4.4 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # aiohttp -<<<<<<< HEAD -aiohttp==3.11.4 -======= -aiohttp==3.11.9 ->>>>>>> master +aiohttp==3.11.10 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # geoip2 # openai -aiosignal==1.3.1 +aiosignal==1.3.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -85,7 +81,7 @@ asn1crypto==1.5.1 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # snowflake-connector-python -astroid==3.3.5 +astroid==3.3.6 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -147,22 +143,14 @@ boto==2.49.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -<<<<<<< HEAD -boto3==1.35.64 -======= -boto3==1.35.76 ->>>>>>> master +boto3==1.35.81 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # django-ses # fs-s3fs # ora2 -<<<<<<< HEAD -botocore==1.35.64 -======= -botocore==1.35.76 ->>>>>>> master +botocore==1.35.81 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -203,7 +191,7 @@ celery==5.4.0 # edx-enterprise # event-tracking # openedx-learning -certifi==2024.8.30 +certifi==2024.12.14 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -278,11 +266,7 @@ click-repl==0.3.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # celery -<<<<<<< HEAD -code-annotations==1.8.1 -======= -code-annotations==2.0.0 ->>>>>>> master +code-annotations==2.1.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -297,11 +281,7 @@ colorama==0.4.6 # via # -r requirements/edx/testing.txt # tox -<<<<<<< HEAD -coverage[toml]==7.6.7 -======= -coverage[toml]==7.6.8 ->>>>>>> master +coverage[toml]==7.6.9 # via # -r requirements/edx/testing.txt # pytest-cov @@ -346,7 +326,7 @@ defusedxml==0.7.1 # ora2 # python3-openid # social-auth-core -diff-cover==9.2.0 +diff-cover==9.2.1 # via -r requirements/edx/testing.txt dill==0.3.9 # via @@ -550,7 +530,7 @@ django-object-actions==4.3.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-enterprise -django-pipeline==3.1.0 +django-pipeline==4.0.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -568,7 +548,7 @@ django-sekizai==4.1.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # openedx-django-wiki -django-ses==4.3.0 +django-ses==4.3.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -722,7 +702,7 @@ edx-codejail==3.5.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-completion==4.7.6 +edx-completion==4.7.7 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -817,7 +797,7 @@ edx-organizations==6.13.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-proctoring==4.18.4 +edx-proctoring==5.0.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -842,7 +822,7 @@ edx-sga==0.25.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-submissions==3.8.3 +edx-submissions==3.8.4 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -908,19 +888,11 @@ execnet==2.1.1 # pytest-xdist factory-boy==3.3.1 # via -r requirements/edx/testing.txt -<<<<<<< HEAD -faker==33.0.0 - # via - # -r requirements/edx/testing.txt - # factory-boy -fastapi==0.115.5 -======= faker==33.1.0 # via # -r requirements/edx/testing.txt # factory-boy fastapi==0.115.6 ->>>>>>> master # via # -r requirements/edx/testing.txt # pact-python @@ -980,7 +952,7 @@ glob2==0.7 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -google-api-core[grpc]==2.23.0 +google-api-core[grpc]==2.24.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -989,16 +961,12 @@ google-api-core[grpc]==2.23.0 # google-cloud-core # google-cloud-firestore # google-cloud-storage -<<<<<<< HEAD -google-api-python-client==2.153.0 -======= -google-api-python-client==2.154.0 ->>>>>>> master +google-api-python-client==2.155.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # firebase-admin -google-auth==2.36.0 +google-auth==2.37.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1050,21 +1018,13 @@ grimp==3.5 # via # -r requirements/edx/testing.txt # import-linter -<<<<<<< HEAD -grpcio==1.68.0 -======= grpcio==1.68.1 ->>>>>>> master # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # google-api-core # grpcio-status -<<<<<<< HEAD -grpcio-status==1.68.0 -======= grpcio-status==1.68.1 ->>>>>>> master # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1253,7 +1213,7 @@ mailsnake==1.6.4 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -mako==1.3.7 +mako==1.3.8 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1343,12 +1303,8 @@ mysqlclient==2.2.6 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -<<<<<<< HEAD -newrelic==10.3.0 -======= # openedx-forum -newrelic==10.3.1 ->>>>>>> master +newrelic==10.4.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1428,7 +1384,7 @@ openedx-events==9.15.0 # edx-name-affirmation # event-tracking # ora2 -openedx-filters==1.11.0 +openedx-filters==1.12.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1452,7 +1408,7 @@ optimizely-sdk==4.1.1 # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -ora2==6.14.1 +ora2==6.14.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1648,11 +1604,7 @@ pyjwkest==1.4.2 # -r requirements/edx/testing.txt # edx-token-utils # lti-consumer-xblock -<<<<<<< HEAD -pyjwt[crypto]==2.10.0 -======= pyjwt[crypto]==2.10.1 ->>>>>>> master # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1670,7 +1622,7 @@ pylatexenc==2.10 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # olxcleaner -pylint==3.3.1 +pylint==3.3.2 # via # -r requirements/edx/testing.txt # edx-lint @@ -1755,11 +1707,7 @@ pysrt==1.1.2 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edxval -<<<<<<< HEAD pytest==8.2.0 -======= -pytest==8.3.4 ->>>>>>> master # via # -r requirements/edx/testing.txt # pylint-pytest @@ -1875,7 +1823,7 @@ recommender-xblock==3.0.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -redis==5.2.0 +redis==5.2.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1928,11 +1876,7 @@ requests-oauthlib==2.0.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # social-auth-core -<<<<<<< HEAD -rpds-py==0.21.0 -======= rpds-py==0.22.3 ->>>>>>> master # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -2120,7 +2064,7 @@ sphinxcontrib-serializinghtml==2.0.0 # sphinx sphinxext-rediraffe==0.2.7 # via -r requirements/edx/doc.txt -sqlparse==0.5.2 +sqlparse==0.5.3 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -2168,11 +2112,7 @@ tinycss2==1.4.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # bleach -<<<<<<< HEAD -tomli==2.1.0 -======= tomli==2.2.1 ->>>>>>> master # via django-stubs tomlkit==0.13.2 # via @@ -2182,11 +2122,7 @@ tomlkit==0.13.2 # snowflake-connector-python tox==4.23.2 # via -r requirements/edx/testing.txt -<<<<<<< HEAD -tqdm==4.67.0 -======= tqdm==4.67.1 ->>>>>>> master # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -2255,7 +2191,7 @@ user-util==1.1.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -uvicorn==0.32.1 +uvicorn==0.34.0 # via # -r requirements/edx/testing.txt # pact-python @@ -2275,7 +2211,7 @@ voluptuous==0.15.2 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # ora2 -vulture==2.13 +vulture==2.14 # via -r requirements/edx/development.in walrus==0.9.4 # via @@ -2313,13 +2249,12 @@ webob==1.8.9 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # xblock -<<<<<<< HEAD -wheel==0.45.0 -======= wheel==0.45.1 ->>>>>>> master # via # -r requirements/edx/../pip-tools.txt + # -r requirements/edx/doc.txt + # -r requirements/edx/testing.txt + # django-pipeline # pip-tools wrapt==1.17.0 # via @@ -2373,11 +2308,7 @@ xss-utils==0.6.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -<<<<<<< HEAD -yarl==1.17.2 -======= yarl==1.18.3 ->>>>>>> master # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index a980f8b39168..980cc42044a2 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -14,16 +14,12 @@ aiohappyeyeballs==2.4.4 # via # -r requirements/edx/base.txt # aiohttp -<<<<<<< HEAD -aiohttp==3.11.4 -======= -aiohttp==3.11.9 ->>>>>>> master +aiohttp==3.11.10 # via # -r requirements/edx/base.txt # geoip2 # openai -aiosignal==1.3.1 +aiosignal==1.3.2 # via # -r requirements/edx/base.txt # aiohttp @@ -61,7 +57,7 @@ asn1crypto==1.5.1 # via # -r requirements/edx/base.txt # snowflake-connector-python -astroid==3.3.5 +astroid==3.3.6 # via sphinx-autoapi attrs==24.2.0 # via @@ -109,21 +105,13 @@ bleach[css]==6.2.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/base.txt -<<<<<<< HEAD -boto3==1.35.64 -======= -boto3==1.35.76 ->>>>>>> master +boto3==1.35.81 # via # -r requirements/edx/base.txt # django-ses # fs-s3fs # ora2 -<<<<<<< HEAD -botocore==1.35.64 -======= -botocore==1.35.76 ->>>>>>> master +botocore==1.35.81 # via # -r requirements/edx/base.txt # boto3 @@ -152,7 +140,7 @@ celery==5.4.0 # edx-enterprise # event-tracking # openedx-learning -certifi==2024.8.30 +certifi==2024.12.14 # via # -r requirements/edx/base.txt # elasticsearch @@ -201,11 +189,7 @@ click-repl==0.3.0 # via # -r requirements/edx/base.txt # celery -<<<<<<< HEAD -code-annotations==1.8.1 -======= -code-annotations==2.0.0 ->>>>>>> master +code-annotations==2.1.0 # via # -r requirements/edx/base.txt # -r requirements/edx/doc.in @@ -406,7 +390,7 @@ django-object-actions==4.3.0 # via # -r requirements/edx/base.txt # edx-enterprise -django-pipeline==3.1.0 +django-pipeline==4.0.0 # via -r requirements/edx/base.txt django-push-notifications==3.1.0 # via @@ -418,7 +402,7 @@ django-sekizai==4.1.0 # via # -r requirements/edx/base.txt # openedx-django-wiki -django-ses==4.3.0 +django-ses==4.3.1 # via -r requirements/edx/base.txt django-simple-history==3.4.0 # via @@ -531,7 +515,7 @@ edx-celeryutils==1.3.0 # super-csv edx-codejail==3.5.2 # via -r requirements/edx/base.txt -edx-completion==4.7.6 +edx-completion==4.7.7 # via -r requirements/edx/base.txt edx-django-release-util==1.4.0 # via @@ -604,7 +588,7 @@ edx-opaque-keys[django]==2.11.0 # ora2 edx-organizations==6.13.0 # via -r requirements/edx/base.txt -edx-proctoring==4.18.4 +edx-proctoring==5.0.1 # via # -r requirements/edx/base.txt # edx-proctoring-proctortrack @@ -623,7 +607,7 @@ edx-search==4.1.1 # openedx-forum edx-sga==0.25.0 # via -r requirements/edx/base.txt -edx-submissions==3.8.3 +edx-submissions==3.8.4 # via # -r requirements/edx/base.txt # ora2 @@ -709,7 +693,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.23.0 +google-api-core[grpc]==2.24.0 # via # -r requirements/edx/base.txt # firebase-admin @@ -717,15 +701,11 @@ google-api-core[grpc]==2.23.0 # google-cloud-core # google-cloud-firestore # google-cloud-storage -<<<<<<< HEAD -google-api-python-client==2.153.0 -======= -google-api-python-client==2.154.0 ->>>>>>> master +google-api-python-client==2.155.0 # via # -r requirements/edx/base.txt # firebase-admin -google-auth==2.36.0 +google-auth==2.37.0 # via # -r requirements/edx/base.txt # google-api-core @@ -765,20 +745,12 @@ googleapis-common-protos==1.66.0 # -r requirements/edx/base.txt # google-api-core # grpcio-status -<<<<<<< HEAD -grpcio==1.68.0 -======= grpcio==1.68.1 ->>>>>>> master # via # -r requirements/edx/base.txt # google-api-core # grpcio-status -<<<<<<< HEAD -grpcio-status==1.68.0 -======= grpcio-status==1.68.1 ->>>>>>> master # via # -r requirements/edx/base.txt # google-api-core @@ -908,7 +880,7 @@ lxml-html-clean==0.4.1 # lxml mailsnake==1.6.4 # via -r requirements/edx/base.txt -mako==1.3.7 +mako==1.3.8 # via # -r requirements/edx/base.txt # acid-xblock @@ -967,15 +939,10 @@ multidict==6.1.0 # aiohttp # yarl mysqlclient==2.2.6 -<<<<<<< HEAD - # via -r requirements/edx/base.txt -newrelic==10.3.0 -======= # via # -r requirements/edx/base.txt # openedx-forum -newrelic==10.3.1 ->>>>>>> master +newrelic==10.4.0 # via # -r requirements/edx/base.txt # edx-django-utils @@ -1034,7 +1001,7 @@ openedx-events==9.15.0 # edx-name-affirmation # event-tracking # ora2 -openedx-filters==1.11.0 +openedx-filters==1.12.0 # via # -r requirements/edx/base.txt # lti-consumer-xblock @@ -1051,7 +1018,7 @@ optimizely-sdk==4.1.1 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt -ora2==6.14.1 +ora2==6.14.2 # via -r requirements/edx/base.txt packaging==24.2 # via @@ -1185,11 +1152,7 @@ pyjwkest==1.4.2 # -r requirements/edx/base.txt # edx-token-utils # lti-consumer-xblock -<<<<<<< HEAD -pyjwt[crypto]==2.10.0 -======= pyjwt[crypto]==2.10.1 ->>>>>>> master # via # -r requirements/edx/base.txt # drf-jwt @@ -1312,7 +1275,7 @@ random2==1.0.2 # via -r requirements/edx/base.txt recommender-xblock==3.0.0 # via -r requirements/edx/base.txt -redis==5.2.0 +redis==5.2.1 # via # -r requirements/edx/base.txt # walrus @@ -1358,11 +1321,7 @@ requests-oauthlib==2.0.0 # via # -r requirements/edx/base.txt # social-auth-core -<<<<<<< HEAD -rpds-py==0.21.0 -======= rpds-py==0.22.3 ->>>>>>> master # via # -r requirements/edx/base.txt # jsonschema @@ -1503,7 +1462,7 @@ sphinxcontrib-serializinghtml==2.0.0 # via sphinx sphinxext-rediraffe==0.2.7 # via -r requirements/edx/doc.in -sqlparse==0.5.2 +sqlparse==0.5.3 # via # -r requirements/edx/base.txt # django @@ -1541,11 +1500,7 @@ tomlkit==0.13.2 # via # -r requirements/edx/base.txt # snowflake-connector-python -<<<<<<< HEAD -tqdm==4.67.0 -======= tqdm==4.67.1 ->>>>>>> master # via # -r requirements/edx/base.txt # nltk @@ -1624,15 +1579,12 @@ webob==1.8.9 # via # -r requirements/edx/base.txt # xblock -<<<<<<< HEAD -wrapt==1.16.0 - # via -r requirements/edx/base.txt -======= -wrapt==1.17.0 +wheel==0.45.1 # via # -r requirements/edx/base.txt - # astroid ->>>>>>> master + # django-pipeline +wrapt==1.17.0 + # via -r requirements/edx/base.txt xblock[django]==5.1.0 # via # -r requirements/edx/base.txt @@ -1668,11 +1620,7 @@ xmlsec==1.3.14 # python3-saml xss-utils==0.6.0 # via -r requirements/edx/base.txt -<<<<<<< HEAD -yarl==1.17.2 -======= yarl==1.18.3 ->>>>>>> master # via # -r requirements/edx/base.txt # aiohttp diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index c9ee8f3aff49..6c3d7272b47e 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -4,7 +4,7 @@ # # make upgrade # -certifi==2024.8.30 +certifi==2024.12.14 # via requests charset-normalizer==2.0.12 # via diff --git a/requirements/edx/semgrep.txt b/requirements/edx/semgrep.txt index 98481fc8d00a..9f7f2a04faae 100644 --- a/requirements/edx/semgrep.txt +++ b/requirements/edx/semgrep.txt @@ -4,7 +4,7 @@ # # make upgrade # -attrs==24.2.0 +attrs==24.3.0 # via # glom # jsonschema @@ -17,7 +17,7 @@ boltons==21.0.0 # semgrep bracex==2.5.post1 # via wcmatch -certifi==2024.8.30 +certifi==2024.12.14 # via requests charset-normalizer==2.0.12 # via @@ -108,23 +108,15 @@ requests==2.32.3 # semgrep rich==13.5.3 # via semgrep -<<<<<<< HEAD -rpds-py==0.21.0 -======= rpds-py==0.22.3 ->>>>>>> master # via # jsonschema # referencing -ruamel-yaml==0.17.40 +ruamel-yaml==0.18.6 # via semgrep ruamel-yaml-clib==0.2.12 # via ruamel-yaml -<<<<<<< HEAD -semgrep==1.96.0 -======= -semgrep==1.97.0 ->>>>>>> master +semgrep==1.100.0 # via -r requirements/edx/semgrep.in tomli==2.0.2 # via semgrep diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index c1b93657bb7d..868f40987d32 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -12,16 +12,12 @@ aiohappyeyeballs==2.4.4 # via # -r requirements/edx/base.txt # aiohttp -<<<<<<< HEAD -aiohttp==3.11.4 -======= -aiohttp==3.11.9 ->>>>>>> master +aiohttp==3.11.10 # via # -r requirements/edx/base.txt # geoip2 # openai -aiosignal==1.3.1 +aiosignal==1.3.2 # via # -r requirements/edx/base.txt # aiohttp @@ -59,7 +55,7 @@ asn1crypto==1.5.1 # via # -r requirements/edx/base.txt # snowflake-connector-python -astroid==3.3.5 +astroid==3.3.6 # via # pylint # pylint-celery @@ -107,21 +103,13 @@ bleach[css]==6.2.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/base.txt -<<<<<<< HEAD -boto3==1.35.64 -======= -boto3==1.35.76 ->>>>>>> master +boto3==1.35.81 # via # -r requirements/edx/base.txt # django-ses # fs-s3fs # ora2 -<<<<<<< HEAD -botocore==1.35.64 -======= -botocore==1.35.76 ->>>>>>> master +botocore==1.35.81 # via # -r requirements/edx/base.txt # boto3 @@ -151,7 +139,7 @@ celery==5.4.0 # edx-enterprise # event-tracking # openedx-learning -certifi==2024.8.30 +certifi==2024.12.14 # via # -r requirements/edx/base.txt # elasticsearch @@ -211,11 +199,7 @@ click-repl==0.3.0 # via # -r requirements/edx/base.txt # celery -<<<<<<< HEAD -code-annotations==1.8.1 -======= -code-annotations==2.0.0 ->>>>>>> master +code-annotations==2.1.0 # via # -r requirements/edx/base.txt # -r requirements/edx/testing.in @@ -226,11 +210,7 @@ codejail-includes==1.0.0 # via -r requirements/edx/base.txt colorama==0.4.6 # via tox -<<<<<<< HEAD -coverage[toml]==7.6.7 -======= -coverage[toml]==7.6.8 ->>>>>>> master +coverage[toml]==7.6.9 # via # -r requirements/edx/coverage.txt # pytest-cov @@ -266,7 +246,7 @@ defusedxml==0.7.1 # ora2 # python3-openid # social-auth-core -diff-cover==9.2.0 +diff-cover==9.2.1 # via -r requirements/edx/coverage.txt dill==0.3.9 # via pylint @@ -437,7 +417,7 @@ django-object-actions==4.3.0 # via # -r requirements/edx/base.txt # edx-enterprise -django-pipeline==3.1.0 +django-pipeline==4.0.0 # via -r requirements/edx/base.txt django-push-notifications==3.1.0 # via @@ -449,7 +429,7 @@ django-sekizai==4.1.0 # via # -r requirements/edx/base.txt # openedx-django-wiki -django-ses==4.3.0 +django-ses==4.3.1 # via -r requirements/edx/base.txt django-simple-history==3.4.0 # via @@ -557,7 +537,7 @@ edx-celeryutils==1.3.0 # super-csv edx-codejail==3.5.2 # via -r requirements/edx/base.txt -edx-completion==4.7.6 +edx-completion==4.7.7 # via -r requirements/edx/base.txt edx-django-release-util==1.4.0 # via @@ -632,7 +612,7 @@ edx-opaque-keys[django]==2.11.0 # ora2 edx-organizations==6.13.0 # via -r requirements/edx/base.txt -edx-proctoring==4.18.4 +edx-proctoring==5.0.1 # via # -r requirements/edx/base.txt # edx-proctoring-proctortrack @@ -651,7 +631,7 @@ edx-search==4.1.1 # openedx-forum edx-sga==0.25.0 # via -r requirements/edx/base.txt -edx-submissions==3.8.3 +edx-submissions==3.8.4 # via # -r requirements/edx/base.txt # ora2 @@ -702,15 +682,9 @@ execnet==2.1.1 # via pytest-xdist factory-boy==3.3.1 # via -r requirements/edx/testing.in -<<<<<<< HEAD -faker==33.0.0 - # via factory-boy -fastapi==0.115.5 -======= faker==33.1.0 # via factory-boy fastapi==0.115.6 ->>>>>>> master # via pact-python fastavro==1.9.7 # via @@ -751,7 +725,7 @@ geoip2==4.8.1 # via -r requirements/edx/base.txt glob2==0.7 # via -r requirements/edx/base.txt -google-api-core[grpc]==2.23.0 +google-api-core[grpc]==2.24.0 # via # -r requirements/edx/base.txt # firebase-admin @@ -759,15 +733,11 @@ google-api-core[grpc]==2.23.0 # google-cloud-core # google-cloud-firestore # google-cloud-storage -<<<<<<< HEAD -google-api-python-client==2.153.0 -======= -google-api-python-client==2.154.0 ->>>>>>> master +google-api-python-client==2.155.0 # via # -r requirements/edx/base.txt # firebase-admin -google-auth==2.36.0 +google-auth==2.37.0 # via # -r requirements/edx/base.txt # google-api-core @@ -809,20 +779,12 @@ googleapis-common-protos==1.66.0 # grpcio-status grimp==3.5 # via import-linter -<<<<<<< HEAD -grpcio==1.68.0 -======= grpcio==1.68.1 ->>>>>>> master # via # -r requirements/edx/base.txt # google-api-core # grpcio-status -<<<<<<< HEAD -grpcio-status==1.68.0 -======= grpcio-status==1.68.1 ->>>>>>> master # via # -r requirements/edx/base.txt # google-api-core @@ -963,7 +925,7 @@ lxml-html-clean==0.4.1 # lxml mailsnake==1.6.4 # via -r requirements/edx/base.txt -mako==1.3.7 +mako==1.3.8 # via # -r requirements/edx/base.txt # acid-xblock @@ -1023,15 +985,10 @@ multidict==6.1.0 # aiohttp # yarl mysqlclient==2.2.6 -<<<<<<< HEAD - # via -r requirements/edx/base.txt -newrelic==10.3.0 -======= # via # -r requirements/edx/base.txt # openedx-forum -newrelic==10.3.1 ->>>>>>> master +newrelic==10.4.0 # via # -r requirements/edx/base.txt # edx-django-utils @@ -1090,7 +1047,7 @@ openedx-events==9.15.0 # edx-name-affirmation # event-tracking # ora2 -openedx-filters==1.11.0 +openedx-filters==1.12.0 # via # -r requirements/edx/base.txt # lti-consumer-xblock @@ -1107,7 +1064,7 @@ optimizely-sdk==4.1.1 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt -ora2==6.14.1 +ora2==6.14.2 # via -r requirements/edx/base.txt packaging==24.2 # via @@ -1256,11 +1213,7 @@ pyjwkest==1.4.2 # -r requirements/edx/base.txt # edx-token-utils # lti-consumer-xblock -<<<<<<< HEAD -pyjwt[crypto]==2.10.0 -======= pyjwt[crypto]==2.10.1 ->>>>>>> master # via # -r requirements/edx/base.txt # drf-jwt @@ -1276,7 +1229,7 @@ pylatexenc==2.10 # via # -r requirements/edx/base.txt # olxcleaner -pylint==3.3.1 +pylint==3.3.2 # via # edx-lint # pylint-celery @@ -1336,11 +1289,7 @@ pysrt==1.1.2 # via # -r requirements/edx/base.txt # edxval -<<<<<<< HEAD pytest==8.2.0 -======= -pytest==8.3.4 ->>>>>>> master # via # -r requirements/edx/testing.in # pylint-pytest @@ -1435,7 +1384,7 @@ random2==1.0.2 # via -r requirements/edx/base.txt recommender-xblock==3.0.0 # via -r requirements/edx/base.txt -redis==5.2.0 +redis==5.2.1 # via # -r requirements/edx/base.txt # walrus @@ -1481,11 +1430,7 @@ requests-oauthlib==2.0.0 # via # -r requirements/edx/base.txt # social-auth-core -<<<<<<< HEAD -rpds-py==0.21.0 -======= rpds-py==0.22.3 ->>>>>>> master # via # -r requirements/edx/base.txt # jsonschema @@ -1587,7 +1532,7 @@ soupsieve==2.6 # via # -r requirements/edx/base.txt # beautifulsoup4 -sqlparse==0.5.2 +sqlparse==0.5.3 # via # -r requirements/edx/base.txt # django @@ -1631,11 +1576,7 @@ tomlkit==0.13.2 # snowflake-connector-python tox==4.23.2 # via -r requirements/edx/testing.in -<<<<<<< HEAD -tqdm==4.67.0 -======= tqdm==4.67.1 ->>>>>>> master # via # -r requirements/edx/base.txt # nltk @@ -1682,7 +1623,7 @@ urllib3==2.2.3 # requests user-util==1.1.0 # via -r requirements/edx/base.txt -uvicorn==0.32.1 +uvicorn==0.34.0 # via pact-python vine==5.1.0 # via @@ -1724,15 +1665,12 @@ webob==1.8.9 # via # -r requirements/edx/base.txt # xblock -<<<<<<< HEAD -wrapt==1.16.0 - # via -r requirements/edx/base.txt -======= -wrapt==1.17.0 +wheel==0.45.1 # via # -r requirements/edx/base.txt - # astroid ->>>>>>> master + # django-pipeline +wrapt==1.17.0 + # via -r requirements/edx/base.txt xblock[django]==5.1.0 # via # -r requirements/edx/base.txt @@ -1768,11 +1706,7 @@ xmlsec==1.3.14 # python3-saml xss-utils==0.6.0 # via -r requirements/edx/base.txt -<<<<<<< HEAD -yarl==1.17.2 -======= yarl==1.18.3 ->>>>>>> master # via # -r requirements/edx/base.txt # aiohttp diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt index a98302aa009b..0149ec4e7e83 100644 --- a/scripts/user_retirement/requirements/base.txt +++ b/scripts/user_retirement/requirements/base.txt @@ -6,25 +6,19 @@ # asgiref==3.8.1 # via django -attrs==24.2.0 +attrs==24.3.0 # via zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.in -<<<<<<< HEAD -boto3==1.35.64 +boto3==1.35.81 # via -r scripts/user_retirement/requirements/base.in -botocore==1.35.64 -======= -boto3==1.35.76 - # via -r scripts/user_retirement/requirements/base.in -botocore==1.35.76 ->>>>>>> master +botocore==1.35.81 # via # boto3 # s3transfer cachetools==5.5.0 # via google-auth -certifi==2024.8.30 +certifi==2024.12.14 # via requests cffi==1.17.1 # via @@ -56,15 +50,11 @@ edx-django-utils==7.1.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.23.0 +google-api-core==2.24.0 # via google-api-python-client -<<<<<<< HEAD -google-api-python-client==2.153.0 -======= -google-api-python-client==2.154.0 ->>>>>>> master +google-api-python-client==2.155.0 # via -r scripts/user_retirement/requirements/base.in -google-auth==2.36.0 +google-auth==2.37.0 # via # google-api-core # google-api-python-client @@ -91,11 +81,7 @@ lxml==5.3.0 # via zeep more-itertools==10.5.0 # via simple-salesforce -<<<<<<< HEAD -newrelic==10.3.0 -======= -newrelic==10.3.1 ->>>>>>> master +newrelic==10.4.0 # via edx-django-utils pbr==6.1.0 # via stevedore @@ -118,11 +104,7 @@ pyasn1-modules==0.4.1 # via google-auth pycparser==2.22 # via cffi -<<<<<<< HEAD -pyjwt[crypto]==2.10.0 -======= pyjwt[crypto]==2.10.1 ->>>>>>> master # via # edx-rest-api-client # simple-salesforce @@ -164,7 +146,7 @@ six==1.17.0 # via # jenkinsapi # python-dateutil -sqlparse==0.5.2 +sqlparse==0.5.3 # via django stevedore==5.4.0 # via edx-django-utils diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt index 3cbe83bf6be7..95751081eac0 100644 --- a/scripts/user_retirement/requirements/testing.txt +++ b/scripts/user_retirement/requirements/testing.txt @@ -8,25 +8,17 @@ asgiref==3.8.1 # via # -r scripts/user_retirement/requirements/base.txt # django -attrs==24.2.0 +attrs==24.3.0 # via # -r scripts/user_retirement/requirements/base.txt # zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.txt -<<<<<<< HEAD -boto3==1.35.64 +boto3==1.35.81 # via # -r scripts/user_retirement/requirements/base.txt # moto -botocore==1.35.64 -======= -boto3==1.35.76 - # via - # -r scripts/user_retirement/requirements/base.txt - # moto -botocore==1.35.76 ->>>>>>> master +botocore==1.35.81 # via # -r scripts/user_retirement/requirements/base.txt # boto3 @@ -36,7 +28,7 @@ cachetools==5.5.0 # via # -r scripts/user_retirement/requirements/base.txt # google-auth -certifi==2024.8.30 +certifi==2024.12.14 # via # -r scripts/user_retirement/requirements/base.txt # requests @@ -80,17 +72,13 @@ edx-django-utils==7.1.0 # edx-rest-api-client edx-rest-api-client==6.0.0 # via -r scripts/user_retirement/requirements/base.txt -google-api-core==2.23.0 +google-api-core==2.24.0 # via # -r scripts/user_retirement/requirements/base.txt # google-api-python-client -<<<<<<< HEAD -google-api-python-client==2.153.0 -======= -google-api-python-client==2.154.0 ->>>>>>> master +google-api-python-client==2.155.0 # via -r scripts/user_retirement/requirements/base.txt -google-auth==2.36.0 +google-auth==2.37.0 # via # -r scripts/user_retirement/requirements/base.txt # google-api-core @@ -144,11 +132,7 @@ more-itertools==10.5.0 # simple-salesforce moto==4.2.14 # via -r scripts/user_retirement/requirements/testing.in -<<<<<<< HEAD -newrelic==10.3.0 -======= -newrelic==10.3.1 ->>>>>>> master +newrelic==10.4.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils @@ -191,11 +175,7 @@ pycparser==2.22 # via # -r scripts/user_retirement/requirements/base.txt # cffi -<<<<<<< HEAD -pyjwt[crypto]==2.10.0 -======= pyjwt[crypto]==2.10.1 ->>>>>>> master # via # -r scripts/user_retirement/requirements/base.txt # edx-rest-api-client @@ -268,7 +248,7 @@ six==1.17.0 # -r scripts/user_retirement/requirements/base.txt # jenkinsapi # python-dateutil -sqlparse==0.5.2 +sqlparse==0.5.3 # via # -r scripts/user_retirement/requirements/base.txt # django diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt index 920cf0cf6ac1..470964021355 100644 --- a/scripts/xblock/requirements.txt +++ b/scripts/xblock/requirements.txt @@ -4,7 +4,7 @@ # # make upgrade # -certifi==2024.8.30 +certifi==2024.12.14 # via requests charset-normalizer==2.0.12 # via