Skip to content

Commit 93bb80b

Browse files
feanilfeanil
authored
Merge pull request #37385 from openedx/feanil/drop_name_affirmation
feat!: Drop edx-name-affirmation as a dependency.
2 parents a50ab7d + af8c626 commit 93bb80b

8 files changed

Lines changed: 3 additions & 71 deletions

File tree

‎.github/workflows/check_python_dependencies.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,5 @@ jobs:
3232
find_python_dependencies \
3333
--req-file requirements/edx/base.txt \
3434
--req-file requirements/edx/testing.txt \
35-
--ignore https://github.com/edx/edx-name-affirmation \
3635
--ignore https://github.com/mitodl/edx-sga \
3736
--ignore https://github.com/open-craft/xblock-poll

‎openedx/core/djangoapps/user_api/accounts/tests/test_api.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,8 @@ def test_validate_name_change_same_name(self):
395395
updated_meta = user_profile.get_meta()
396396
self.assertEqual(meta, updated_meta)
397397

398-
@patch('edx_name_affirmation.name_change_validator.NameChangeValidator.validate', Mock(return_value=False))
398+
@patch('openedx.core.djangoapps.user_api.accounts.api._does_name_change_require_verification',
399+
Mock(return_value=True))
399400
@patch('openedx.core.djangoapps.user_api.accounts.api.get_certificates_for_user',
400401
Mock(return_value=[{'status': CertificateStatuses.downloadable}]))
401402
@patch('openedx.core.djangoapps.user_api.accounts.api.get_verified_enrollments',
@@ -414,8 +415,6 @@ def test_name_update_requires_idv(self):
414415
account_settings = get_account_settings(self.default_request)[0]
415416
assert account_settings['name'] != 'New Name'
416417

417-
@patch('edx_name_affirmation.name_change_validator.NameChangeValidator', Mock())
418-
@patch('edx_name_affirmation.name_change_validator.NameChangeValidator.validate', Mock(return_value=True))
419418
@ddt.data(
420419
(True, False),
421420
(False, True),

‎openedx/features/name_affirmation_api/tests/test_utils.py‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import ddt
77
from edx_django_utils.plugins import PluginError
88

9-
from openedx.features.name_affirmation_api.utils import is_name_affirmation_installed, get_name_affirmation_service
9+
from openedx.features.name_affirmation_api.utils import is_name_affirmation_installed
1010

1111

1212
@ddt.ddt
@@ -23,14 +23,3 @@ def test_name_affirmation_not_installed(self, mock_manager):
2323
mock_manager.side_effect = PluginError('No such plugin')
2424
with self.assertRaises(PluginError):
2525
self.assertFalse(is_name_affirmation_installed())
26-
27-
@patch('edx_name_affirmation.services.NameAffirmationService')
28-
@ddt.data(True, False)
29-
def test_get_name_affirmation_service(self, name_affirmation_installed, mock_service):
30-
with patch('openedx.features.name_affirmation_api.utils.is_name_affirmation_installed',
31-
return_value=name_affirmation_installed):
32-
name_affirmation_service = get_name_affirmation_service()
33-
if name_affirmation_installed:
34-
self.assertEqual(name_affirmation_service, mock_service())
35-
else:
36-
self.assertIsNone(name_affirmation_service)

‎requirements/edx/base.txt‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ django==5.2.8
219219
# edx-event-bus-redis
220220
# edx-i18n-tools
221221
# edx-milestones
222-
# edx-name-affirmation
223222
# edx-organizations
224223
# edx-proctoring
225224
# edx-rbac
@@ -261,7 +260,6 @@ django-config-models==2.9.0
261260
# via
262261
# -r requirements/edx/kernel.in
263262
# edx-enterprise
264-
# edx-name-affirmation
265263
# enterprise-integrated-channels
266264
# lti-consumer-xblock
267265
django-cors-headers==4.9.0
@@ -306,7 +304,6 @@ django-model-utils==5.0.0
306304
# edx-completion
307305
# edx-enterprise
308306
# edx-milestones
309-
# edx-name-affirmation
310307
# edx-organizations
311308
# edx-proctoring
312309
# edx-rbac
@@ -350,7 +347,6 @@ django-simple-history==3.10.1
350347
# via
351348
# -r requirements/edx/kernel.in
352349
# edx-enterprise
353-
# edx-name-affirmation
354350
# edx-organizations
355351
# edx-proctoring
356352
# enterprise-integrated-channels
@@ -392,7 +388,6 @@ djangorestframework==3.16.1
392388
# edx-completion
393389
# edx-drf-extensions
394390
# edx-enterprise
395-
# edx-name-affirmation
396391
# edx-organizations
397392
# edx-proctoring
398393
# edx-submissions
@@ -420,7 +415,6 @@ edx-ace==1.15.0
420415
edx-api-doc-tools==2.1.0
421416
# via
422417
# -r requirements/edx/kernel.in
423-
# edx-name-affirmation
424418
# openedx-authz
425419
edx-auth-backends==4.6.2
426420
# via -r requirements/edx/kernel.in
@@ -436,7 +430,6 @@ edx-ccx-keys==2.0.2
436430
edx-celeryutils==1.4.0
437431
# via
438432
# -r requirements/edx/kernel.in
439-
# edx-name-affirmation
440433
# super-csv
441434
edx-codejail==4.1.0
442435
# via -r requirements/edx/kernel.in
@@ -459,7 +452,6 @@ edx-django-utils==8.0.1
459452
# edx-enterprise
460453
# edx-event-bus-kafka
461454
# edx-event-bus-redis
462-
# edx-name-affirmation
463455
# edx-rest-api-client
464456
# edx-toggles
465457
# edx-when
@@ -473,7 +465,6 @@ edx-drf-extensions==10.6.0
473465
# -r requirements/edx/kernel.in
474466
# edx-completion
475467
# edx-enterprise
476-
# edx-name-affirmation
477468
# edx-organizations
478469
# edx-proctoring
479470
# edx-rbac
@@ -497,8 +488,6 @@ edx-i18n-tools==1.9.0
497488
# xblocks-contrib
498489
edx-milestones==1.1.0
499490
# via -r requirements/edx/kernel.in
500-
edx-name-affirmation==3.0.2
501-
# via -r requirements/edx/kernel.in
502491
edx-opaque-keys[django]==3.0.0
503492
# via
504493
# -r requirements/edx/kernel.in
@@ -554,7 +543,6 @@ edx-toggles==5.4.1
554543
# edx-enterprise
555544
# edx-event-bus-kafka
556545
# edx-event-bus-redis
557-
# edx-name-affirmation
558546
# edx-search
559547
# edxval
560548
# event-tracking
@@ -845,7 +833,6 @@ openedx-events==10.5.0
845833
# edx-enterprise
846834
# edx-event-bus-kafka
847835
# edx-event-bus-redis
848-
# edx-name-affirmation
849836
# event-tracking
850837
# ora2
851838
openedx-filters==2.1.0

‎requirements/edx/development.txt‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@ django==5.2.8
396396
# edx-event-bus-redis
397397
# edx-i18n-tools
398398
# edx-milestones
399-
# edx-name-affirmation
400399
# edx-organizations
401400
# edx-proctoring
402401
# edx-rbac
@@ -452,7 +451,6 @@ django-config-models==2.9.0
452451
# -r requirements/edx/doc.txt
453452
# -r requirements/edx/testing.txt
454453
# edx-enterprise
455-
# edx-name-affirmation
456454
# enterprise-integrated-channels
457455
# lti-consumer-xblock
458456
django-cors-headers==4.9.0
@@ -515,7 +513,6 @@ django-model-utils==5.0.0
515513
# edx-completion
516514
# edx-enterprise
517515
# edx-milestones
518-
# edx-name-affirmation
519516
# edx-organizations
520517
# edx-proctoring
521518
# edx-rbac
@@ -579,7 +576,6 @@ django-simple-history==3.10.1
579576
# -r requirements/edx/doc.txt
580577
# -r requirements/edx/testing.txt
581578
# edx-enterprise
582-
# edx-name-affirmation
583579
# edx-organizations
584580
# edx-proctoring
585581
# enterprise-integrated-channels
@@ -635,7 +631,6 @@ djangorestframework==3.16.1
635631
# edx-completion
636632
# edx-drf-extensions
637633
# edx-enterprise
638-
# edx-name-affirmation
639634
# edx-organizations
640635
# edx-proctoring
641636
# edx-submissions
@@ -689,7 +684,6 @@ edx-api-doc-tools==2.1.0
689684
# via
690685
# -r requirements/edx/doc.txt
691686
# -r requirements/edx/testing.txt
692-
# edx-name-affirmation
693687
# openedx-authz
694688
edx-auth-backends==4.6.2
695689
# via
@@ -710,7 +704,6 @@ edx-celeryutils==1.4.0
710704
# via
711705
# -r requirements/edx/doc.txt
712706
# -r requirements/edx/testing.txt
713-
# edx-name-affirmation
714707
# super-csv
715708
edx-codejail==4.1.0
716709
# via
@@ -741,7 +734,6 @@ edx-django-utils==8.0.1
741734
# edx-enterprise
742735
# edx-event-bus-kafka
743736
# edx-event-bus-redis
744-
# edx-name-affirmation
745737
# edx-rest-api-client
746738
# edx-toggles
747739
# edx-when
@@ -756,7 +748,6 @@ edx-drf-extensions==10.6.0
756748
# -r requirements/edx/testing.txt
757749
# edx-completion
758750
# edx-enterprise
759-
# edx-name-affirmation
760751
# edx-organizations
761752
# edx-proctoring
762753
# edx-rbac
@@ -790,10 +781,6 @@ edx-milestones==1.1.0
790781
# via
791782
# -r requirements/edx/doc.txt
792783
# -r requirements/edx/testing.txt
793-
edx-name-affirmation==3.0.2
794-
# via
795-
# -r requirements/edx/doc.txt
796-
# -r requirements/edx/testing.txt
797784
edx-opaque-keys[django]==3.0.0
798785
# via
799786
# -r requirements/edx/doc.txt
@@ -864,7 +851,6 @@ edx-toggles==5.4.1
864851
# edx-enterprise
865852
# edx-event-bus-kafka
866853
# edx-event-bus-redis
867-
# edx-name-affirmation
868854
# edx-search
869855
# edxval
870856
# event-tracking
@@ -1406,7 +1392,6 @@ openedx-events==10.5.0
14061392
# edx-enterprise
14071393
# edx-event-bus-kafka
14081394
# edx-event-bus-redis
1409-
# edx-name-affirmation
14101395
# event-tracking
14111396
# ora2
14121397
openedx-filters==2.1.0

‎requirements/edx/doc.txt‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,6 @@ django==5.2.8
281281
# edx-event-bus-redis
282282
# edx-i18n-tools
283283
# edx-milestones
284-
# edx-name-affirmation
285284
# edx-organizations
286285
# edx-proctoring
287286
# edx-rbac
@@ -329,7 +328,6 @@ django-config-models==2.9.0
329328
# via
330329
# -r requirements/edx/base.txt
331330
# edx-enterprise
332-
# edx-name-affirmation
333331
# enterprise-integrated-channels
334332
# lti-consumer-xblock
335333
django-cors-headers==4.9.0
@@ -377,7 +375,6 @@ django-model-utils==5.0.0
377375
# edx-completion
378376
# edx-enterprise
379377
# edx-milestones
380-
# edx-name-affirmation
381378
# edx-organizations
382379
# edx-proctoring
383380
# edx-rbac
@@ -426,7 +423,6 @@ django-simple-history==3.10.1
426423
# via
427424
# -r requirements/edx/base.txt
428425
# edx-enterprise
429-
# edx-name-affirmation
430426
# edx-organizations
431427
# edx-proctoring
432428
# enterprise-integrated-channels
@@ -468,7 +464,6 @@ djangorestframework==3.16.1
468464
# edx-completion
469465
# edx-drf-extensions
470466
# edx-enterprise
471-
# edx-name-affirmation
472467
# edx-organizations
473468
# edx-proctoring
474469
# edx-submissions
@@ -508,7 +503,6 @@ edx-ace==1.15.0
508503
edx-api-doc-tools==2.1.0
509504
# via
510505
# -r requirements/edx/base.txt
511-
# edx-name-affirmation
512506
# openedx-authz
513507
edx-auth-backends==4.6.2
514508
# via -r requirements/edx/base.txt
@@ -524,7 +518,6 @@ edx-ccx-keys==2.0.2
524518
edx-celeryutils==1.4.0
525519
# via
526520
# -r requirements/edx/base.txt
527-
# edx-name-affirmation
528521
# super-csv
529522
edx-codejail==4.1.0
530523
# via -r requirements/edx/base.txt
@@ -547,7 +540,6 @@ edx-django-utils==8.0.1
547540
# edx-enterprise
548541
# edx-event-bus-kafka
549542
# edx-event-bus-redis
550-
# edx-name-affirmation
551543
# edx-rest-api-client
552544
# edx-toggles
553545
# edx-when
@@ -561,7 +553,6 @@ edx-drf-extensions==10.6.0
561553
# -r requirements/edx/base.txt
562554
# edx-completion
563555
# edx-enterprise
564-
# edx-name-affirmation
565556
# edx-organizations
566557
# edx-proctoring
567558
# edx-rbac
@@ -585,8 +576,6 @@ edx-i18n-tools==1.9.0
585576
# xblocks-contrib
586577
edx-milestones==1.1.0
587578
# via -r requirements/edx/base.txt
588-
edx-name-affirmation==3.0.2
589-
# via -r requirements/edx/base.txt
590579
edx-opaque-keys[django]==3.0.0
591580
# via
592581
# -r requirements/edx/base.txt
@@ -644,7 +633,6 @@ edx-toggles==5.4.1
644633
# edx-enterprise
645634
# edx-event-bus-kafka
646635
# edx-event-bus-redis
647-
# edx-name-affirmation
648636
# edx-search
649637
# edxval
650638
# event-tracking
@@ -1023,7 +1011,6 @@ openedx-events==10.5.0
10231011
# edx-enterprise
10241012
# edx-event-bus-kafka
10251013
# edx-event-bus-redis
1026-
# edx-name-affirmation
10271014
# event-tracking
10281015
# ora2
10291016
openedx-filters==2.1.0

‎requirements/edx/kernel.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ edx-enterprise
7676
edx-event-bus-kafka>=5.6.0 # Kafka implementation of event bus
7777
edx-event-bus-redis
7878
edx-milestones
79-
edx-name-affirmation
8079
edx-opaque-keys>=2.12.0
8180
edx-organizations
8281
edx-proctoring>=2.0.1

0 commit comments

Comments
 (0)