From 87eb6718c43cb4449b03bb6e65308f0f948e1fa7 Mon Sep 17 00:00:00 2001 From: Santhosh Kumar Date: Fri, 19 Sep 2025 22:37:07 +0530 Subject: [PATCH] feat!: Remove Proctortrack dependency (#37284) * 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. * feat: Update the package lock * chore: Updating the requirements * chore: Updating the requirements2 * chore: Clean up comments in github.in Remove comment about django42 support pending release. --- .gitignore | 3 ++- conf/locale/config.yaml | 2 -- package-lock.json | 10 ---------- package.json | 1 - requirements/edx/base.txt | 6 +----- requirements/edx/development.txt | 5 ----- requirements/edx/doc.txt | 6 +----- requirements/edx/github.in | 4 ---- requirements/edx/testing.txt | 6 +----- 9 files changed, 5 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index aaeb22eef1..a5d5252de7 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/conf/locale/config.yaml b/conf/locale/config.yaml index 0c906bec2b..38030b0c0e 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-lock.json b/package-lock.json index 4e5be31004..27b810dad5 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", @@ -7683,15 +7682,6 @@ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", "license": "MIT" }, - "node_modules/edx-proctoring-proctortrack": { - "version": "1.1.1", - "resolved": "git+https://git@github.com/anupdhabarde/edx-proctoring-proctortrack.git#f0fa9edbd16aa5af5a41ac309d2609e529ea8732", - "integrity": "sha512-8F/z5zZBCjk4gzB2/1iWX4q2IXAx20eDs6A+OJs9OMjsfJSHJE3owqkyaBl46+1eE0UL0zTdAi8uVhfL4XYpJw==", - "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", diff --git a/package.json b/package.json index 5d7736cc34..e66e58b54d 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 3c075ecb4d..7d3799320a 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -4,8 +4,6 @@ # # 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 @@ -513,9 +511,7 @@ edx-opaque-keys[django]==3.0.0 edx-organizations==7.3.0 # 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 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 970c02322f..c96d8bbe19 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -4,10 +4,6 @@ # # 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 @@ -807,7 +803,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 diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 0d26329bc7..9618446f16 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -4,8 +4,6 @@ # # 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 @@ -597,9 +595,7 @@ edx-opaque-keys[django]==3.0.0 edx-organizations==7.3.0 # 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 diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 6ec36d3a06..cfaa2d0f3d 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -86,7 +86,3 @@ ############################################################################## # ... 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 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index d899611c82..5bd4e49957 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -4,8 +4,6 @@ # # 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 @@ -620,9 +618,7 @@ edx-opaque-keys[django]==3.0.0 edx-organizations==7.3.0 # 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