feat: [ACI-1031] Upgrade requirements and resolve conflicts

.coveragerc

@@ -10,3 +10,7 @@ omit =
     *admin.py
     *static*
     *templates*
+[report]
+exclude_lines = 
+    pragma: no cover
+    if TYPE_CHECKING:

.github/workflows/ci.yml

@@ -67,13 +67,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["py38"]
+        python-version: ["py311"]
         django-version: ["django42"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.11"
           architecture: x64
       - name: Setup Nodejs Env
         run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
@@ -106,7 +106,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.11"
           architecture: x64
       - name: Install Dependencies
         run: make requirements

.github/workflows/migrations-mysql8-check.yml

@@ -32,7 +32,7 @@ jobs:
     - name: Get pip cache dir
       id: pip-cache-dir
       run: |
-        echo "::set-output name=dir::$(pip cache dir)"
+        echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
     - name: Cache pip dependencies
       id: cache-dependencies
       uses: actions/cache@v4

Makefile

@@ -172,18 +172,5 @@ pii_check: ## Check for PII annotations on all Django models
 coverage:
 	coverage xml
 
-### Local testing suite commands ###
-
-build_test_image: # Builds Docker image used for testing so devs don't need to install requirements locally (useful for firefox / xvfb)
-	docker build -t credentials:local -f Dockerfile-testing .
-
-# This should be ran locally, not inside of the devstack container
-quality_and_translations_tests_suite: build_test_image
-	docker run -e "TERM=xterm-256color" -v /edx/app/credentials/node_modules/ -v `pwd`:/edx/app/credentials/ credentials:local bash -c 'cd /edx/app/credentials/ && make check_translations_up_to_date && make validate_translations && make quality && make check_keywords && make pii_check'
-
-# This should be ran locally, not inside of the devstack container
-unit_tests_suite: build_test_image
-	docker run -e "TERM=xterm-256color" -v /edx/app/credentials/node_modules/ -v `pwd`:/edx/app/credentials/ credentials:local bash -c 'cd /edx/app/credentials/ && make static && make tests && make coverage'
-
 docs:
 	tox -e docs

credentials/apps/api/v2/tests/test_views.py

@@ -83,7 +83,7 @@ def test_authentication(self):
 
     def test_create(self):
         program = ProgramFactory(site=self.site)
-        program_certificate = ProgramCertificateFactory(site=self.site, program_uuid=program.uuid)
+        program_certificate = ProgramCertificateFactory(site=self.site, program_uuid=program.uuid, program=program)
         expected_username = self.user.username
         expected_attribute_name = "fake-name"
         expected_attribute_value = "fake-value"
@@ -356,43 +356,6 @@ def test_list_type_filtering(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.data["results"], self.serialize_user_credential([program_cred], many=True))
 
-    # This test should be removed in MICROBA-1198 in favor of the next test.
-    def test_list_visible_filtering(self):
-        """Verify the endpoint can filter by visible date."""
-        program_certificate = ProgramCertificateFactory(site=self.site)
-        course_run = CourseRunFactory()
-        course_certificate = CourseCertificateFactory(course_id=course_run.key, course_run=course_run, site=self.site)
-
-        course_cred = UserCredentialFactory(credential=course_certificate)
-        program_cred = UserCredentialFactory(credential=program_certificate)
-
-        UserCredentialAttributeFactory(
-            user_credential=program_cred,
-            name="visible_date",
-            value="9999-01-01T01:01:01Z",
-        )
-
-        self.authenticate_user(self.user)
-        self.add_user_permission(self.user, "view_usercredential")
-
-        both = [course_cred, program_cred]
-
-        response = self.client.get(self.list_path)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data["results"], self.serialize_user_credential(both, many=True))
-
-        response = self.client.get(self.list_path + "?only_visible=True")
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data["results"], self.serialize_user_credential([course_cred], many=True))
-
-        response = self.client.get(self.list_path + "?only_visible=False")
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data["results"], self.serialize_user_credential(both, many=True))
-
-    # The following test is the same as the previous test, but with the
-    # USE_CERTIFICATE_AVAILABLE_DATE waffle switch enabled. Clean up previous
-    # tests in MICROBA-1198.
-    @override_switch("credentials.use_certificate_available_date", active=True)
     def test_list_visible_filtering_with_certificate_available_date(self):
         """Verify the endpoint can filter by visible date."""
         course = CourseFactory.create(site=self.site)

credentials/apps/badges/processing/generic.py

@@ -38,7 +38,8 @@ def process_event(sender, **kwargs):
 
     except BadgesProcessingError as error:
         logger.error(f"Badges processing error: {error}")
-        return
+        return None
+    return None
 
 
 def identify_user(*, event_type, event_payload):

credentials/apps/badges/tests/test_issuers.py

@@ -155,7 +155,7 @@ def test_revoke_credly_badge_success(self, mock_revoke_badge):
         self.assertEqual(user_credential.state, "revoked")
 
     @patch.object(CredlyAPIClient, "revoke_badge", side_effect=CredlyAPIError("Revocation failed"))
-    def test_revoke_credly_badge_failure(self, mock_revoke_badge):
+    def test_revoke_credly_badge_failure(self, mock_revoke_badge):  # pylint: disable=unused-argument
         user_credential = self.issued_user_credential_type.objects.create(
             username="test_user",
             credential_content_type=ContentType.objects.get_for_model(self.badge_template),

credentials/apps/core/admin.py

@@ -28,7 +28,7 @@ def activate_selected(self: admin.ModelAdmin, request, queryset):
             message = _("1 {model_name} entry was successfully activated.")
         else:
             message = _("{count} {model_name} entries were successfully activated.")
-        message = message.format(count=count, model_name=model_name)  # pylint: disable=no-member
+        message = message.format(count=count, model_name=model_name)
         self.message_user(request, message)
 
     @admin.action(description=_("Deactivate selected entries"))
@@ -42,7 +42,7 @@ def deactivate_selected(self: admin.ModelAdmin, request, queryset):
             message = _("1 {model_name} entry was successfully deactivated.")
         else:
             message = _("{count} {model_name} entries were successfully deactivated.")
-        message = message.format(count=count, model_name=model_name)  # pylint: disable=no-member
+        message = message.format(count=count, model_name=model_name)
         self.message_user(request, message)
 
     @admin.action(description=_("Add is_staff to selected entries"))
@@ -56,7 +56,7 @@ def add_is_staff_to_selected(self: admin.ModelAdmin, request, queryset):
             message = _("1 {model_name} entry was successfully changed.")
         else:
             message = _("{count} {model_name} entries were successfully changed.")
-        message = message.format(count=count, model_name=model_name)  # pylint: disable=no-member
+        message = message.format(count=count, model_name=model_name)
         self.message_user(request, message)
 
     @admin.action(description=_("Remove is_staff from selected entries"))
@@ -70,7 +70,7 @@ def remove_is_staff_from_selected(self: admin.ModelAdmin, request, queryset):
             message = _("1 {model_name} entry was successfully changed.")
         else:
             message = _("{count} {model_name} entries were successfully changed.")
-        message = message.format(count=count, model_name=model_name)  # pylint: disable=no-member
+        message = message.format(count=count, model_name=model_name)
         self.message_user(request, message)
 
     @admin.action(description=_("Add is_superuser to selected entries"))
@@ -84,7 +84,7 @@ def add_is_superuser_to_selected(self: admin.ModelAdmin, request, queryset):
             message = _("1 {model_name} entry was successfully changed.")
         else:
             message = _("{count} {model_name} entries were successfully changed.")
-        message = message.format(count=count, model_name=model_name)  # pylint: disable=no-member
+        message = message.format(count=count, model_name=model_name)
         self.message_user(request, message)
 
     @admin.action(description=_("Remove is_superuser from selected entries"))
@@ -103,7 +103,7 @@ def remove_is_superuser_from_selected(self: admin.ModelAdmin, request, queryset)
             message = _("1 {model_name} entry was successfully changed.")
         else:
             message = _("{count} {model_name} entries were successfully changed.")
-        message = message.format(count=count, model_name=model_name)  # pylint: disable=no-member
+        message = message.format(count=count, model_name=model_name)
         self.message_user(request, message)
         self.message_user(request, WARNING, level=messages.WARNING)
 

credentials/apps/credentials/api.py

@@ -17,13 +17,10 @@
 
 
 if TYPE_CHECKING:
-    from django.contrib.auth import get_user_model
     from django.contrib.sites.models import Site
 
     from credentials.apps.catalog.models import CourseRun
 
-    User = get_user_model()
-
 
 logger = logging.getLogger(__name__)
 
@@ -235,7 +232,7 @@ def get_credential_dates(user_credentials, many):
         return get_credential_visible_date(user_credentials, use_date_override=True)
 
 
-def process_course_credential_update(user: "User", course_run_key: str, mode: str, credential_status: str) -> None:
+def process_course_credential_update(user, course_run_key: str, mode: str, credential_status: str) -> None:
     """
     A utility function responsible for creating or updating a course credential associated with a learner. Primarily
     used when consuming events from the Event Bus.

credentials/apps/credentials/migrations/0029_alter_usercredential_credential_content_type.py

@@ -8,7 +8,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("contenttypes", "0002_remove_content_type_name"),
-        ("credentials", "0028_alter_historicalprogramcompletionemailconfiguration_options"),
+        ("credentials", "0029_signatory_not_mandatory"),
     ]
 
     operations = [

credentials/apps/credentials/migrations/0029_signatory_not_mandatory.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.13 on 2024-07-09 16:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("credentials", "0028_alter_historicalprogramcompletionemailconfiguration_options"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="coursecertificate",
+            name="signatories",
+            field=models.ManyToManyField(blank=True, to="credentials.signatory"),
+        ),
+    ]

credentials/apps/credentials/models.py

@@ -204,6 +204,11 @@ class CourseCertificate(AbstractCertificate):
     .. no_pii: This model has no PII.
     """
 
+    # Not all sites will require signatories in course certificate configurations, but signatories are required in
+    # program certificates configurations. This is cloned data from the system of record, as the course certificates
+    # don't render in the Credentials IDA.
+    signatories = models.ManyToManyField(Signatory, blank=True)
+
     # course_id is identical to course_run.key. It is a deprecated legacy property.  For now it is still used as a
     # convenience accessor and filter but it will be eventually removed. If you need the value stored in course_id,
     # get it from course_run.key.