diff --git a/.github/workflows/check_python_dependencies.yml b/.github/workflows/check_python_dependencies.yml index f215880f0e..9710fe612b 100644 --- a/.github/workflows/check_python_dependencies.yml +++ b/.github/workflows/check_python_dependencies.yml @@ -32,6 +32,5 @@ jobs: find_python_dependencies \ --req-file requirements/edx/base.txt \ --req-file requirements/edx/testing.txt \ - --ignore https://github.com/edx/edx-name-affirmation \ --ignore https://github.com/mitodl/edx-sga \ --ignore https://github.com/open-craft/xblock-poll diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_api.py b/openedx/core/djangoapps/user_api/accounts/tests/test_api.py index 8cdb7a6341..fbf0347af4 100644 --- a/openedx/core/djangoapps/user_api/accounts/tests/test_api.py +++ b/openedx/core/djangoapps/user_api/accounts/tests/test_api.py @@ -395,7 +395,8 @@ class TestAccountApi(UserSettingsEventTestMixin, EmailTemplateTagMixin, CreateAc updated_meta = user_profile.get_meta() self.assertEqual(meta, updated_meta) - @patch('edx_name_affirmation.name_change_validator.NameChangeValidator.validate', Mock(return_value=False)) + @patch('openedx.core.djangoapps.user_api.accounts.api._does_name_change_require_verification', + Mock(return_value=True)) @patch('openedx.core.djangoapps.user_api.accounts.api.get_certificates_for_user', Mock(return_value=[{'status': CertificateStatuses.downloadable}])) @patch('openedx.core.djangoapps.user_api.accounts.api.get_verified_enrollments', @@ -414,8 +415,6 @@ class TestAccountApi(UserSettingsEventTestMixin, EmailTemplateTagMixin, CreateAc account_settings = get_account_settings(self.default_request)[0] assert account_settings['name'] != 'New Name' - @patch('edx_name_affirmation.name_change_validator.NameChangeValidator', Mock()) - @patch('edx_name_affirmation.name_change_validator.NameChangeValidator.validate', Mock(return_value=True)) @ddt.data( (True, False), (False, True), diff --git a/openedx/features/name_affirmation_api/tests/test_utils.py b/openedx/features/name_affirmation_api/tests/test_utils.py index f157b95d9d..7ce42509e5 100644 --- a/openedx/features/name_affirmation_api/tests/test_utils.py +++ b/openedx/features/name_affirmation_api/tests/test_utils.py @@ -6,7 +6,7 @@ from unittest.mock import patch import ddt from edx_django_utils.plugins import PluginError -from openedx.features.name_affirmation_api.utils import is_name_affirmation_installed, get_name_affirmation_service +from openedx.features.name_affirmation_api.utils import is_name_affirmation_installed @ddt.ddt @@ -23,14 +23,3 @@ class TestNameAffirmationAPIUtils(TestCase): mock_manager.side_effect = PluginError('No such plugin') with self.assertRaises(PluginError): self.assertFalse(is_name_affirmation_installed()) - - @patch('edx_name_affirmation.services.NameAffirmationService') - @ddt.data(True, False) - def test_get_name_affirmation_service(self, name_affirmation_installed, mock_service): - with patch('openedx.features.name_affirmation_api.utils.is_name_affirmation_installed', - return_value=name_affirmation_installed): - name_affirmation_service = get_name_affirmation_service() - if name_affirmation_installed: - self.assertEqual(name_affirmation_service, mock_service()) - else: - self.assertIsNone(name_affirmation_service) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index e5495b08f4..daf5796ca3 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -219,7 +219,6 @@ django==5.2.8 # edx-event-bus-redis # edx-i18n-tools # edx-milestones - # edx-name-affirmation # edx-organizations # edx-proctoring # edx-rbac @@ -261,7 +260,6 @@ django-config-models==2.9.0 # via # -r requirements/edx/kernel.in # edx-enterprise - # edx-name-affirmation # enterprise-integrated-channels # lti-consumer-xblock django-cors-headers==4.9.0 @@ -306,7 +304,6 @@ django-model-utils==5.0.0 # edx-completion # edx-enterprise # edx-milestones - # edx-name-affirmation # edx-organizations # edx-proctoring # edx-rbac @@ -350,7 +347,6 @@ django-simple-history==3.10.1 # via # -r requirements/edx/kernel.in # edx-enterprise - # edx-name-affirmation # edx-organizations # edx-proctoring # enterprise-integrated-channels @@ -392,7 +388,6 @@ djangorestframework==3.16.1 # edx-completion # edx-drf-extensions # edx-enterprise - # edx-name-affirmation # edx-organizations # edx-proctoring # edx-submissions @@ -420,7 +415,6 @@ edx-ace==1.15.0 edx-api-doc-tools==2.1.0 # via # -r requirements/edx/kernel.in - # edx-name-affirmation # openedx-authz edx-auth-backends==4.6.2 # via -r requirements/edx/kernel.in @@ -436,7 +430,6 @@ edx-ccx-keys==2.0.2 edx-celeryutils==1.4.0 # via # -r requirements/edx/kernel.in - # edx-name-affirmation # super-csv edx-codejail==4.1.0 # via -r requirements/edx/kernel.in @@ -459,7 +452,6 @@ edx-django-utils==8.0.1 # edx-enterprise # edx-event-bus-kafka # edx-event-bus-redis - # edx-name-affirmation # edx-rest-api-client # edx-toggles # edx-when @@ -473,7 +465,6 @@ edx-drf-extensions==10.6.0 # -r requirements/edx/kernel.in # edx-completion # edx-enterprise - # edx-name-affirmation # edx-organizations # edx-proctoring # edx-rbac @@ -497,8 +488,6 @@ edx-i18n-tools==1.9.0 # xblocks-contrib edx-milestones==1.1.0 # via -r requirements/edx/kernel.in -edx-name-affirmation==3.0.2 - # via -r requirements/edx/kernel.in edx-opaque-keys[django]==3.0.0 # via # -r requirements/edx/kernel.in @@ -554,7 +543,6 @@ edx-toggles==5.4.1 # edx-enterprise # edx-event-bus-kafka # edx-event-bus-redis - # edx-name-affirmation # edx-search # edxval # event-tracking @@ -845,7 +833,6 @@ openedx-events==10.5.0 # edx-enterprise # edx-event-bus-kafka # edx-event-bus-redis - # edx-name-affirmation # event-tracking # ora2 openedx-filters==2.1.0 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index c37b9eb454..d1dfc6ae30 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -396,7 +396,6 @@ django==5.2.8 # edx-event-bus-redis # edx-i18n-tools # edx-milestones - # edx-name-affirmation # edx-organizations # edx-proctoring # edx-rbac @@ -452,7 +451,6 @@ django-config-models==2.9.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-enterprise - # edx-name-affirmation # enterprise-integrated-channels # lti-consumer-xblock django-cors-headers==4.9.0 @@ -515,7 +513,6 @@ django-model-utils==5.0.0 # edx-completion # edx-enterprise # edx-milestones - # edx-name-affirmation # edx-organizations # edx-proctoring # edx-rbac @@ -579,7 +576,6 @@ django-simple-history==3.10.1 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-enterprise - # edx-name-affirmation # edx-organizations # edx-proctoring # enterprise-integrated-channels @@ -635,7 +631,6 @@ djangorestframework==3.16.1 # edx-completion # edx-drf-extensions # edx-enterprise - # edx-name-affirmation # edx-organizations # edx-proctoring # edx-submissions @@ -689,7 +684,6 @@ edx-api-doc-tools==2.1.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt - # edx-name-affirmation # openedx-authz edx-auth-backends==4.6.2 # via @@ -710,7 +704,6 @@ edx-celeryutils==1.4.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt - # edx-name-affirmation # super-csv edx-codejail==4.1.0 # via @@ -741,7 +734,6 @@ edx-django-utils==8.0.1 # edx-enterprise # edx-event-bus-kafka # edx-event-bus-redis - # edx-name-affirmation # edx-rest-api-client # edx-toggles # edx-when @@ -756,7 +748,6 @@ edx-drf-extensions==10.6.0 # -r requirements/edx/testing.txt # edx-completion # edx-enterprise - # edx-name-affirmation # edx-organizations # edx-proctoring # edx-rbac @@ -790,10 +781,6 @@ edx-milestones==1.1.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-name-affirmation==3.0.2 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt edx-opaque-keys[django]==3.0.0 # via # -r requirements/edx/doc.txt @@ -864,7 +851,6 @@ edx-toggles==5.4.1 # edx-enterprise # edx-event-bus-kafka # edx-event-bus-redis - # edx-name-affirmation # edx-search # edxval # event-tracking @@ -1406,7 +1392,6 @@ openedx-events==10.5.0 # edx-enterprise # edx-event-bus-kafka # edx-event-bus-redis - # edx-name-affirmation # event-tracking # ora2 openedx-filters==2.1.0 diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 9371f16e6c..65da1c193a 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -281,7 +281,6 @@ django==5.2.8 # edx-event-bus-redis # edx-i18n-tools # edx-milestones - # edx-name-affirmation # edx-organizations # edx-proctoring # edx-rbac @@ -329,7 +328,6 @@ django-config-models==2.9.0 # via # -r requirements/edx/base.txt # edx-enterprise - # edx-name-affirmation # enterprise-integrated-channels # lti-consumer-xblock django-cors-headers==4.9.0 @@ -377,7 +375,6 @@ django-model-utils==5.0.0 # edx-completion # edx-enterprise # edx-milestones - # edx-name-affirmation # edx-organizations # edx-proctoring # edx-rbac @@ -426,7 +423,6 @@ django-simple-history==3.10.1 # via # -r requirements/edx/base.txt # edx-enterprise - # edx-name-affirmation # edx-organizations # edx-proctoring # enterprise-integrated-channels @@ -468,7 +464,6 @@ djangorestframework==3.16.1 # edx-completion # edx-drf-extensions # edx-enterprise - # edx-name-affirmation # edx-organizations # edx-proctoring # edx-submissions @@ -508,7 +503,6 @@ edx-ace==1.15.0 edx-api-doc-tools==2.1.0 # via # -r requirements/edx/base.txt - # edx-name-affirmation # openedx-authz edx-auth-backends==4.6.2 # via -r requirements/edx/base.txt @@ -524,7 +518,6 @@ edx-ccx-keys==2.0.2 edx-celeryutils==1.4.0 # via # -r requirements/edx/base.txt - # edx-name-affirmation # super-csv edx-codejail==4.1.0 # via -r requirements/edx/base.txt @@ -547,7 +540,6 @@ edx-django-utils==8.0.1 # edx-enterprise # edx-event-bus-kafka # edx-event-bus-redis - # edx-name-affirmation # edx-rest-api-client # edx-toggles # edx-when @@ -561,7 +553,6 @@ edx-drf-extensions==10.6.0 # -r requirements/edx/base.txt # edx-completion # edx-enterprise - # edx-name-affirmation # edx-organizations # edx-proctoring # edx-rbac @@ -585,8 +576,6 @@ edx-i18n-tools==1.9.0 # xblocks-contrib edx-milestones==1.1.0 # via -r requirements/edx/base.txt -edx-name-affirmation==3.0.2 - # via -r requirements/edx/base.txt edx-opaque-keys[django]==3.0.0 # via # -r requirements/edx/base.txt @@ -644,7 +633,6 @@ edx-toggles==5.4.1 # edx-enterprise # edx-event-bus-kafka # edx-event-bus-redis - # edx-name-affirmation # edx-search # edxval # event-tracking @@ -1023,7 +1011,6 @@ openedx-events==10.5.0 # edx-enterprise # edx-event-bus-kafka # edx-event-bus-redis - # edx-name-affirmation # event-tracking # ora2 openedx-filters==2.1.0 diff --git a/requirements/edx/kernel.in b/requirements/edx/kernel.in index de2667f284..38bf64f8ed 100644 --- a/requirements/edx/kernel.in +++ b/requirements/edx/kernel.in @@ -76,7 +76,6 @@ edx-enterprise edx-event-bus-kafka>=5.6.0 # Kafka implementation of event bus edx-event-bus-redis edx-milestones -edx-name-affirmation edx-opaque-keys>=2.12.0 edx-organizations edx-proctoring>=2.0.1 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 23655adbdc..16884c9807 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -308,7 +308,6 @@ django==5.2.8 # edx-event-bus-redis # edx-i18n-tools # edx-milestones - # edx-name-affirmation # edx-organizations # edx-proctoring # edx-rbac @@ -356,7 +355,6 @@ django-config-models==2.9.0 # via # -r requirements/edx/base.txt # edx-enterprise - # edx-name-affirmation # enterprise-integrated-channels # lti-consumer-xblock django-cors-headers==4.9.0 @@ -404,7 +402,6 @@ django-model-utils==5.0.0 # edx-completion # edx-enterprise # edx-milestones - # edx-name-affirmation # edx-organizations # edx-proctoring # edx-rbac @@ -453,7 +450,6 @@ django-simple-history==3.10.1 # via # -r requirements/edx/base.txt # edx-enterprise - # edx-name-affirmation # edx-organizations # edx-proctoring # enterprise-integrated-channels @@ -495,7 +491,6 @@ djangorestframework==3.16.1 # edx-completion # edx-drf-extensions # edx-enterprise - # edx-name-affirmation # edx-organizations # edx-proctoring # edx-submissions @@ -530,7 +525,6 @@ edx-ace==1.15.0 edx-api-doc-tools==2.1.0 # via # -r requirements/edx/base.txt - # edx-name-affirmation # openedx-authz edx-auth-backends==4.6.2 # via -r requirements/edx/base.txt @@ -546,7 +540,6 @@ edx-ccx-keys==2.0.2 edx-celeryutils==1.4.0 # via # -r requirements/edx/base.txt - # edx-name-affirmation # super-csv edx-codejail==4.1.0 # via -r requirements/edx/base.txt @@ -569,7 +562,6 @@ edx-django-utils==8.0.1 # edx-enterprise # edx-event-bus-kafka # edx-event-bus-redis - # edx-name-affirmation # edx-rest-api-client # edx-toggles # edx-when @@ -583,7 +575,6 @@ edx-drf-extensions==10.6.0 # -r requirements/edx/base.txt # edx-completion # edx-enterprise - # edx-name-affirmation # edx-organizations # edx-proctoring # edx-rbac @@ -609,8 +600,6 @@ edx-lint==5.6.0 # via -r requirements/edx/testing.in edx-milestones==1.1.0 # via -r requirements/edx/base.txt -edx-name-affirmation==3.0.2 - # via -r requirements/edx/base.txt edx-opaque-keys[django]==3.0.0 # via # -r requirements/edx/base.txt @@ -668,7 +657,6 @@ edx-toggles==5.4.1 # edx-enterprise # edx-event-bus-kafka # edx-event-bus-redis - # edx-name-affirmation # edx-search # edxval # event-tracking @@ -1069,7 +1057,6 @@ openedx-events==10.5.0 # edx-enterprise # edx-event-bus-kafka # edx-event-bus-redis - # edx-name-affirmation # event-tracking # ora2 openedx-filters==2.1.0