From 1ca2b14efde18adb642481210e0f732fd3411c60 Mon Sep 17 00:00:00 2001 From: Santhosh Kumar Date: Wed, 27 Aug 2025 01:26:48 +0000 Subject: [PATCH 1/5] chore!: remove Proctortrack dependency Remove all Proctortrack dependencies from the project, including: - Python package dependencies in requirements files - JavaScript package dependency in package.json - Translation configuration in conf/locale/config.yaml BREAKING CHANGE: Proctortrack proctoring provider is no longer available as a dependency. This change removes the Proctortrack Dependency while preserving code references. --- conf/locale/config.yaml | 2 -- package.json | 1 - requirements/edx/base.txt | 3 +-- requirements/edx/development.txt | 5 +---- requirements/edx/doc.txt | 3 +-- requirements/edx/github.in | 3 +-- requirements/edx/testing.txt | 3 +-- 7 files changed, 5 insertions(+), 15 deletions(-) diff --git a/conf/locale/config.yaml b/conf/locale/config.yaml index 0c906bec2b61..38030b0c0e98 100644 --- a/conf/locale/config.yaml +++ b/conf/locale/config.yaml @@ -52,7 +52,6 @@ ignore_dirs: # Makefile `extract_translations` target to ensure it makes to Transifex. third_party: - wiki - - edx_proctoring_proctortrack # How should .po files be segmented? See i18n/segment.py for details. Strings @@ -85,7 +84,6 @@ generate_merge: - mako.po - mako-studio.po - wiki.po - - edx_proctoring_proctortrack.po djangojs.po: - djangojs-partial.po - djangojs-studio.po diff --git a/package.json b/package.json index 2ca951d7dbe3..4aeda5dda9d0 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,6 @@ "css-loader": "7.1.2", "datatables": "1.10.18", "datatables.net-fixedcolumns": "5.0.4", - "edx-proctoring-proctortrack": "git+https://git@github.com/anupdhabarde/edx-proctoring-proctortrack.git#f0fa9edbd16aa5af5a41ac309d2609e529ea8732", "edx-ui-toolkit": "1.8.7", "exports-loader": "0.6.4", "file-loader": "^6.2.0", diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 6da0bc272213..78fe7b98e57b 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -4,8 +4,7 @@ # # make upgrade # --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 # via -r requirements/edx/kernel.in aiohappyeyeballs==2.6.1 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 8b5045bcadb0..7976cb7652a5 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -4,10 +4,7 @@ # # make upgrade # --e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt + accessible-pygments==0.0.5 # via # -r requirements/edx/doc.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 95a89c37da55..71157caa712b 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -4,8 +4,7 @@ # # make upgrade # --e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack - # via -r requirements/edx/base.txt + accessible-pygments==0.0.5 # via pydata-sphinx-theme acid-xblock==0.4.1 diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 6ec36d3a0681..1d5f8fd61d20 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -88,5 +88,4 @@ # ... add dependencies here # django42 support PR merged but new release is pending. -# https://github.com/openedx/edx-platform/issues/33431 --e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack +# https://github.com/openedx/edx-platform/issues/33431 \ No newline at end of file diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index c217765b1790..44fd14ed2a45 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -4,8 +4,7 @@ # # make upgrade # --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 # via -r requirements/edx/base.txt aiohappyeyeballs==2.6.1 From a290c49b8f0009c9d051cc1def4aa5a4e9d03e11 Mon Sep 17 00:00:00 2001 From: Santhosh Kumar Date: Wed, 27 Aug 2025 06:25:21 +0000 Subject: [PATCH 2/5] feat: Update the package lock --- package-lock.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index ec99138ca97f..32c0b5b8740e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,6 @@ "css-loader": "7.1.2", "datatables": "1.10.18", "datatables.net-fixedcolumns": "5.0.4", - "edx-proctoring-proctortrack": "git+https://git@github.com/anupdhabarde/edx-proctoring-proctortrack.git#f0fa9edbd16aa5af5a41ac309d2609e529ea8732", "edx-ui-toolkit": "1.8.7", "exports-loader": "0.6.4", "file-loader": "^6.2.0", @@ -7954,15 +7953,6 @@ "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" }, - "node_modules/edx-proctoring-proctortrack": { - "version": "1.1.1", - "resolved": "git+https://git@github.com/anupdhabarde/edx-proctoring-proctortrack.git#f0fa9edbd16aa5af5a41ac309d2609e529ea8732", - "integrity": "sha512-IQkVQPaTOrC23IpnylBZx7072bRz//OaZEp0uQaF0jiNROny3fXo3ebtKreEqyrEpNv1UEpdzuVh1uAfQC1JDg==", - "license": "Apache-2.0", - "peerDependencies": { - "@edx/edx-proctoring": "^4.8.1" - } - }, "node_modules/edx-ui-toolkit": { "version": "1.8.7", "resolved": "https://registry.npmjs.org/edx-ui-toolkit/-/edx-ui-toolkit-1.8.7.tgz", From 711f467d5c52adfa19485e6d057c93af234479a5 Mon Sep 17 00:00:00 2001 From: Santhosh Kumar Date: Wed, 27 Aug 2025 07:38:19 +0000 Subject: [PATCH 3/5] chore: Updating the requirements --- requirements/edx/base.txt | 23 ++++++-------- requirements/edx/coverage.txt | 2 +- requirements/edx/development.txt | 29 +++++++---------- requirements/edx/doc.txt | 25 ++++++--------- requirements/edx/semgrep.txt | 4 +-- requirements/edx/testing.txt | 31 +++++++------------ .../structures_pruning/requirements/base.txt | 9 ++---- .../requirements/testing.txt | 11 ++----- scripts/user_retirement/requirements/base.txt | 17 ++++------ .../user_retirement/requirements/testing.txt | 21 +++++-------- 10 files changed, 61 insertions(+), 111 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 78fe7b98e57b..e0af39f10819 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -4,7 +4,6 @@ # # make upgrade # - acid-xblock==0.4.1 # via -r requirements/edx/kernel.in aiohappyeyeballs==2.6.1 @@ -53,7 +52,7 @@ backoff==1.10.0 # via analytics-python bcrypt==4.3.0 # via paramiko -beautifulsoup4==4.13.4 +beautifulsoup4==4.13.5 # via # openedx-forum # pynliner @@ -69,14 +68,14 @@ bleach[css]==6.2.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/kernel.in -boto3==1.40.15 +boto3==1.40.18 # via # -r requirements/edx/kernel.in # django-ses # fs-s3fs # ora2 # snowflake-connector-python -botocore==1.40.15 +botocore==1.40.18 # via # -r requirements/edx/kernel.in # boto3 @@ -311,7 +310,7 @@ django-model-utils==5.0.0 # enterprise-integrated-channels # ora2 # super-csv -django-mptt==0.17.0 +django-mptt==0.18.0 # via # -r requirements/edx/kernel.in # openedx-django-wiki @@ -513,9 +512,7 @@ edx-opaque-keys[django]==3.0.0 edx-organizations==7.2.1 # via -r requirements/edx/kernel.in edx-proctoring==5.2.0 - # via - # -r requirements/edx/kernel.in - # edx-proctoring-proctortrack + # via -r requirements/edx/kernel.in edx-rbac==2.1.0 # via # edx-enterprise @@ -643,7 +640,7 @@ gunicorn==23.0.0 # via -r requirements/edx/kernel.in h11==0.16.0 # via httpcore -h2==4.2.0 +h2==4.3.0 # via httpx help-tokens==3.2.0 # via -r requirements/edx/kernel.in @@ -875,8 +872,6 @@ path-py==12.5.0 # edx-enterprise # ora2 # staff-graded-xblock -pbr==7.0.1 - # via stevedore pgpy==0.6.0 # via edx-enterprise piexif==1.1.3 @@ -887,7 +882,7 @@ pillow==11.3.0 # edx-enterprise # edx-organizations # edxval -platformdirs==4.3.8 +platformdirs==4.4.0 # via snowflake-connector-python polib==1.2.0 # via edx-i18n-tools @@ -1159,7 +1154,7 @@ sqlparse==0.5.3 # via django staff-graded-xblock==3.1.0 # via -r requirements/edx/bundled.in -stevedore==5.4.1 +stevedore==5.5.0 # via # -r requirements/edx/kernel.in # code-annotations @@ -1185,7 +1180,7 @@ tqdm==4.67.1 # via # nltk # openai -typing-extensions==4.14.1 +typing-extensions==4.15.0 # via # aiosignal # anyio diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index 95e9ea206ca1..8d7141c6ff5f 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -6,7 +6,7 @@ # chardet==5.2.0 # via diff-cover -coverage==7.10.4 +coverage==7.10.5 # via -r requirements/edx/coverage.in diff-cover==9.6.0 # via -r requirements/edx/coverage.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 7976cb7652a5..d44c3e38c487 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -4,7 +4,6 @@ # # make upgrade # - accessible-pygments==0.0.5 # via # -r requirements/edx/doc.txt @@ -111,7 +110,7 @@ bcrypt==4.3.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # paramiko -beautifulsoup4==4.13.4 +beautifulsoup4==4.13.5 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -137,7 +136,7 @@ boto==2.49.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -boto3==1.40.15 +boto3==1.40.18 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -145,7 +144,7 @@ boto3==1.40.15 # fs-s3fs # ora2 # snowflake-connector-python -botocore==1.40.15 +botocore==1.40.18 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -278,7 +277,7 @@ colorama==0.4.6 # via # -r requirements/edx/testing.txt # tox -coverage[toml]==7.10.4 +coverage[toml]==7.10.5 # via # -r requirements/edx/testing.txt # pytest-cov @@ -511,7 +510,7 @@ django-model-utils==5.0.0 # enterprise-integrated-channels # ora2 # super-csv -django-mptt==0.17.0 +django-mptt==0.18.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -805,7 +804,6 @@ edx-proctoring==5.2.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt - # edx-proctoring-proctortrack edx-rbac==2.1.0 # via # -r requirements/edx/doc.txt @@ -896,7 +894,7 @@ execnet==2.1.1 # pytest-xdist factory-boy==3.3.3 # via -r requirements/edx/testing.txt -faker==37.5.3 +faker==37.6.0 # via # -r requirements/edx/testing.txt # factory-boy @@ -1034,7 +1032,7 @@ h11==0.16.0 # -r requirements/edx/testing.txt # httpcore # uvicorn -h2==4.2.0 +h2==4.3.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1455,11 +1453,6 @@ path-py==12.5.0 # staff-graded-xblock pathspec==0.12.1 # via mypy -pbr==7.0.1 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # stevedore pgpy==0.6.0 # via # -r requirements/edx/doc.txt @@ -1484,7 +1477,7 @@ pip-tools==7.4.1 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/../pip-tools.txt -platformdirs==4.3.8 +platformdirs==4.4.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -2061,11 +2054,11 @@ staff-graded-xblock==3.1.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -starlette==0.47.2 +starlette==0.47.3 # via # -r requirements/edx/testing.txt # fastapi -stevedore==5.4.1 +stevedore==5.5.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -2120,7 +2113,7 @@ types-pyyaml==6.0.12.20250822 # djangorestframework-stubs types-requests==2.32.4.20250809 # via djangorestframework-stubs -typing-extensions==4.14.1 +typing-extensions==4.15.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 71157caa712b..26ebd8fe4484 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -4,7 +4,6 @@ # # make upgrade # - accessible-pygments==0.0.5 # via pydata-sphinx-theme acid-xblock==0.4.1 @@ -83,7 +82,7 @@ bcrypt==4.3.0 # via # -r requirements/edx/base.txt # paramiko -beautifulsoup4==4.13.4 +beautifulsoup4==4.13.5 # via # -r requirements/edx/base.txt # openedx-forum @@ -104,14 +103,14 @@ bleach[css]==6.2.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/base.txt -boto3==1.40.15 +boto3==1.40.18 # via # -r requirements/edx/base.txt # django-ses # fs-s3fs # ora2 # snowflake-connector-python -botocore==1.40.15 +botocore==1.40.18 # via # -r requirements/edx/base.txt # boto3 @@ -378,7 +377,7 @@ django-model-utils==5.0.0 # enterprise-integrated-channels # ora2 # super-csv -django-mptt==0.17.0 +django-mptt==0.18.0 # via # -r requirements/edx/base.txt # openedx-django-wiki @@ -597,9 +596,7 @@ edx-opaque-keys[django]==3.0.0 edx-organizations==7.2.1 # via -r requirements/edx/base.txt edx-proctoring==5.2.0 - # via - # -r requirements/edx/base.txt - # edx-proctoring-proctortrack + # via -r requirements/edx/base.txt edx-rbac==2.1.0 # via # -r requirements/edx/base.txt @@ -761,7 +758,7 @@ h11==0.16.0 # via # -r requirements/edx/base.txt # httpcore -h2==4.2.0 +h2==4.3.0 # via # -r requirements/edx/base.txt # httpx @@ -1057,10 +1054,6 @@ path-py==12.5.0 # edx-enterprise # ora2 # staff-graded-xblock -pbr==7.0.1 - # via - # -r requirements/edx/base.txt - # stevedore pgpy==0.6.0 # via # -r requirements/edx/base.txt @@ -1075,7 +1068,7 @@ pillow==11.3.0 # edx-enterprise # edx-organizations # edxval -platformdirs==4.3.8 +platformdirs==4.4.0 # via # -r requirements/edx/base.txt # snowflake-connector-python @@ -1460,7 +1453,7 @@ sqlparse==0.5.3 # django staff-graded-xblock==3.1.0 # via -r requirements/edx/base.txt -stevedore==5.4.1 +stevedore==5.5.0 # via # -r requirements/edx/base.txt # code-annotations @@ -1498,7 +1491,7 @@ tqdm==4.67.1 # -r requirements/edx/base.txt # nltk # openai -typing-extensions==4.14.1 +typing-extensions==4.15.0 # via # -r requirements/edx/base.txt # aiosignal diff --git a/requirements/edx/semgrep.txt b/requirements/edx/semgrep.txt index fdca84ba5920..286030caa159 100644 --- a/requirements/edx/semgrep.txt +++ b/requirements/edx/semgrep.txt @@ -113,11 +113,11 @@ ruamel-yaml==0.18.15 # via semgrep ruamel-yaml-clib==0.2.12 # via ruamel-yaml -semgrep==1.132.1 +semgrep==1.133.0 # via -r requirements/edx/semgrep.in tomli==2.0.2 # via semgrep -typing-extensions==4.14.1 +typing-extensions==4.15.0 # via # opentelemetry-sdk # referencing diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 44fd14ed2a45..9b63b3e79b85 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -4,7 +4,6 @@ # # make upgrade # - acid-xblock==0.4.1 # via -r requirements/edx/base.txt aiohappyeyeballs==2.6.1 @@ -80,7 +79,7 @@ bcrypt==4.3.0 # via # -r requirements/edx/base.txt # paramiko -beautifulsoup4==4.13.4 +beautifulsoup4==4.13.5 # via # -r requirements/edx/base.txt # -r requirements/edx/testing.in @@ -101,14 +100,14 @@ bleach[css]==6.2.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/base.txt -boto3==1.40.15 +boto3==1.40.18 # via # -r requirements/edx/base.txt # django-ses # fs-s3fs # ora2 # snowflake-connector-python -botocore==1.40.15 +botocore==1.40.18 # via # -r requirements/edx/base.txt # boto3 @@ -211,7 +210,7 @@ codejail-includes==2.0.0 # via -r requirements/edx/base.txt colorama==0.4.6 # via tox -coverage[toml]==7.10.4 +coverage[toml]==7.10.5 # via # -r requirements/edx/coverage.txt # pytest-cov @@ -404,7 +403,7 @@ django-model-utils==5.0.0 # enterprise-integrated-channels # ora2 # super-csv -django-mptt==0.17.0 +django-mptt==0.18.0 # via # -r requirements/edx/base.txt # openedx-django-wiki @@ -620,9 +619,7 @@ edx-opaque-keys[django]==3.0.0 edx-organizations==7.2.1 # via -r requirements/edx/base.txt edx-proctoring==5.2.0 - # via - # -r requirements/edx/base.txt - # edx-proctoring-proctortrack + # via -r requirements/edx/base.txt edx-rbac==2.1.0 # via # -r requirements/edx/base.txt @@ -693,7 +690,7 @@ execnet==2.1.1 # via pytest-xdist factory-boy==3.3.3 # via -r requirements/edx/testing.in -faker==37.5.3 +faker==37.6.0 # via factory-boy fastapi==0.116.1 # via pact-python @@ -795,7 +792,7 @@ h11==0.16.0 # -r requirements/edx/base.txt # httpcore # uvicorn -h2==4.2.0 +h2==4.3.0 # via # -r requirements/edx/base.txt # httpx @@ -1106,10 +1103,6 @@ path-py==12.5.0 # edx-enterprise # ora2 # staff-graded-xblock -pbr==7.0.1 - # via - # -r requirements/edx/base.txt - # stevedore pgpy==0.6.0 # via # -r requirements/edx/base.txt @@ -1122,7 +1115,7 @@ pillow==11.3.0 # edx-enterprise # edx-organizations # edxval -platformdirs==4.3.8 +platformdirs==4.4.0 # via # -r requirements/edx/base.txt # pylint @@ -1527,9 +1520,9 @@ sqlparse==0.5.3 # django staff-graded-xblock==3.1.0 # via -r requirements/edx/base.txt -starlette==0.47.2 +starlette==0.47.3 # via fastapi -stevedore==5.4.1 +stevedore==5.5.0 # via # -r requirements/edx/base.txt # code-annotations @@ -1571,7 +1564,7 @@ tqdm==4.67.1 # -r requirements/edx/base.txt # nltk # openai -typing-extensions==4.14.1 +typing-extensions==4.15.0 # via # -r requirements/edx/base.txt # aiosignal diff --git a/scripts/structures_pruning/requirements/base.txt b/scripts/structures_pruning/requirements/base.txt index 21f8e8070eeb..9a0bf10bf311 100644 --- a/scripts/structures_pruning/requirements/base.txt +++ b/scripts/structures_pruning/requirements/base.txt @@ -14,17 +14,12 @@ dnspython==2.7.0 # via pymongo edx-opaque-keys==3.0.0 # via -r scripts/structures_pruning/requirements/base.in -pbr==7.0.1 - # via stevedore pymongo==4.4.0 # via # -c scripts/structures_pruning/requirements/../../../requirements/constraints.txt # -r scripts/structures_pruning/requirements/base.in # edx-opaque-keys -stevedore==5.4.1 +stevedore==5.5.0 # via edx-opaque-keys -typing-extensions==4.14.1 +typing-extensions==4.15.0 # via edx-opaque-keys - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/scripts/structures_pruning/requirements/testing.txt b/scripts/structures_pruning/requirements/testing.txt index afe9f04ff960..5e0e3bf6a83d 100644 --- a/scripts/structures_pruning/requirements/testing.txt +++ b/scripts/structures_pruning/requirements/testing.txt @@ -22,10 +22,6 @@ iniconfig==2.1.0 # via pytest packaging==25.0 # via pytest -pbr==7.0.1 - # via - # -r scripts/structures_pruning/requirements/base.txt - # stevedore pluggy==1.6.0 # via pytest pygments==2.19.2 @@ -36,14 +32,11 @@ pymongo==4.4.0 # edx-opaque-keys pytest==8.4.1 # via -r scripts/structures_pruning/requirements/testing.in -stevedore==5.4.1 +stevedore==5.5.0 # via # -r scripts/structures_pruning/requirements/base.txt # edx-opaque-keys -typing-extensions==4.14.1 +typing-extensions==4.15.0 # via # -r scripts/structures_pruning/requirements/base.txt # edx-opaque-keys - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt index 798a52bd9ab2..b11cfde50fa4 100644 --- a/scripts/user_retirement/requirements/base.txt +++ b/scripts/user_retirement/requirements/base.txt @@ -10,9 +10,9 @@ attrs==25.3.0 # via zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.in -boto3==1.40.15 +boto3==1.40.18 # via -r scripts/user_retirement/requirements/base.in -botocore==1.40.15 +botocore==1.40.18 # via # boto3 # s3transfer @@ -79,9 +79,7 @@ lxml==5.3.2 # zeep more-itertools==10.7.0 # via simple-salesforce -pbr==7.0.1 - # via stevedore -platformdirs==4.3.8 +platformdirs==4.4.0 # via zeep proto-plus==1.26.1 # via google-api-core @@ -134,7 +132,7 @@ rsa==4.9.1 # via google-auth s3transfer==0.13.1 # via boto3 -simple-salesforce==1.12.8 +simple-salesforce==1.12.9 # via -r scripts/user_retirement/requirements/base.in simplejson==3.20.1 # via -r scripts/user_retirement/requirements/base.in @@ -142,9 +140,9 @@ six==1.17.0 # via python-dateutil sqlparse==0.5.3 # via django -stevedore==5.4.1 +stevedore==5.5.0 # via edx-django-utils -typing-extensions==4.14.1 +typing-extensions==4.15.0 # via simple-salesforce unicodecsv==0.14.1 # via -r scripts/user_retirement/requirements/base.in @@ -156,6 +154,3 @@ urllib3==2.5.0 # requests zeep==4.3.1 # via simple-salesforce - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt index bcf26e41b4e2..58ddd514242f 100644 --- a/scripts/user_retirement/requirements/testing.txt +++ b/scripts/user_retirement/requirements/testing.txt @@ -14,11 +14,11 @@ attrs==25.3.0 # zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.txt -boto3==1.40.15 +boto3==1.40.18 # via # -r scripts/user_retirement/requirements/base.txt # moto -botocore==1.40.15 +botocore==1.40.18 # via # -r scripts/user_retirement/requirements/base.txt # boto3 @@ -130,15 +130,11 @@ more-itertools==10.7.0 # via # -r scripts/user_retirement/requirements/base.txt # simple-salesforce -moto==5.1.10 +moto==5.1.11 # via -r scripts/user_retirement/requirements/testing.in packaging==25.0 # via pytest -pbr==7.0.1 - # via - # -r scripts/user_retirement/requirements/base.txt - # stevedore -platformdirs==4.3.8 +platformdirs==4.4.0 # via # -r scripts/user_retirement/requirements/base.txt # zeep @@ -237,7 +233,7 @@ s3transfer==0.13.1 # via # -r scripts/user_retirement/requirements/base.txt # boto3 -simple-salesforce==1.12.8 +simple-salesforce==1.12.9 # via -r scripts/user_retirement/requirements/base.txt simplejson==3.20.1 # via -r scripts/user_retirement/requirements/base.txt @@ -249,11 +245,11 @@ sqlparse==0.5.3 # via # -r scripts/user_retirement/requirements/base.txt # django -stevedore==5.4.1 +stevedore==5.5.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -typing-extensions==4.14.1 +typing-extensions==4.15.0 # via # -r scripts/user_retirement/requirements/base.txt # simple-salesforce @@ -278,6 +274,3 @@ zeep==4.3.1 # via # -r scripts/user_retirement/requirements/base.txt # simple-salesforce - -# The following packages are considered to be unsafe in a requirements file: -# setuptools From cdea2ca94e00c4f87810636ec5d64db4200babd6 Mon Sep 17 00:00:00 2001 From: Santhosh Kumar Date: Wed, 27 Aug 2025 08:40:13 +0000 Subject: [PATCH 4/5] chore: Updating the requirements2 --- .gitignore | 3 ++- requirements/edx/base.txt | 4 ++-- requirements/edx/development.txt | 4 ++-- requirements/edx/doc.txt | 4 ++-- requirements/edx/testing.txt | 4 ++-- scripts/user_retirement/requirements/base.txt | 6 +++--- scripts/user_retirement/requirements/testing.txt | 6 +++--- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index aaeb22eef13d..a5d5252de705 100644 --- a/.gitignore +++ b/.gitignore @@ -143,7 +143,8 @@ autodeploy.properties .ws_migrations_complete dist *.bak - +.venv/ +venv*/ # Visual Studio Code .vscode diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 92887a729b5a..e0af39f10819 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -68,14 +68,14 @@ bleach[css]==6.2.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/kernel.in -boto3==1.40.17 +boto3==1.40.18 # via # -r requirements/edx/kernel.in # django-ses # fs-s3fs # ora2 # snowflake-connector-python -botocore==1.40.17 +botocore==1.40.18 # via # -r requirements/edx/kernel.in # boto3 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index b8871838c273..d44c3e38c487 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -136,7 +136,7 @@ boto==2.49.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -boto3==1.40.17 +boto3==1.40.18 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -144,7 +144,7 @@ boto3==1.40.17 # fs-s3fs # ora2 # snowflake-connector-python -botocore==1.40.17 +botocore==1.40.18 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index a8b51a00db0b..26ebd8fe4484 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -103,14 +103,14 @@ bleach[css]==6.2.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/base.txt -boto3==1.40.17 +boto3==1.40.18 # via # -r requirements/edx/base.txt # django-ses # fs-s3fs # ora2 # snowflake-connector-python -botocore==1.40.17 +botocore==1.40.18 # via # -r requirements/edx/base.txt # boto3 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 2cde3411ae45..9b63b3e79b85 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -100,14 +100,14 @@ bleach[css]==6.2.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/base.txt -boto3==1.40.17 +boto3==1.40.18 # via # -r requirements/edx/base.txt # django-ses # fs-s3fs # ora2 # snowflake-connector-python -botocore==1.40.17 +botocore==1.40.18 # via # -r requirements/edx/base.txt # boto3 diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt index 8a65a43818d4..b11cfde50fa4 100644 --- a/scripts/user_retirement/requirements/base.txt +++ b/scripts/user_retirement/requirements/base.txt @@ -10,9 +10,9 @@ attrs==25.3.0 # via zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.in -boto3==1.40.17 +boto3==1.40.18 # via -r scripts/user_retirement/requirements/base.in -botocore==1.40.17 +botocore==1.40.18 # via # boto3 # s3transfer @@ -79,7 +79,7 @@ lxml==5.3.2 # zeep more-itertools==10.7.0 # via simple-salesforce -platformdirs==4.3.8 +platformdirs==4.4.0 # via zeep proto-plus==1.26.1 # via google-api-core diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt index 6616a01d4e2e..58ddd514242f 100644 --- a/scripts/user_retirement/requirements/testing.txt +++ b/scripts/user_retirement/requirements/testing.txt @@ -14,11 +14,11 @@ attrs==25.3.0 # zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.txt -boto3==1.40.17 +boto3==1.40.18 # via # -r scripts/user_retirement/requirements/base.txt # moto -botocore==1.40.17 +botocore==1.40.18 # via # -r scripts/user_retirement/requirements/base.txt # boto3 @@ -134,7 +134,7 @@ moto==5.1.11 # via -r scripts/user_retirement/requirements/testing.in packaging==25.0 # via pytest -platformdirs==4.3.8 +platformdirs==4.4.0 # via # -r scripts/user_retirement/requirements/base.txt # zeep From c2c251cc9aaea2f5646d6240ae3f6d037c9c0a1e Mon Sep 17 00:00:00 2001 From: Santhosh Kumar Date: Thu, 28 Aug 2025 12:53:51 +0530 Subject: [PATCH 5/5] chore: Clean up comments in github.in Remove comment about django42 support pending release. --- requirements/edx/github.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 1d5f8fd61d20..cfaa2d0f3d7f 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -86,6 +86,3 @@ ############################################################################## # ... add dependencies here - -# django42 support PR merged but new release is pending. -# https://github.com/openedx/edx-platform/issues/33431 \ No newline at end of file