From 3ad2a70462b044fac037fe84023cb0712f4dd237 Mon Sep 17 00:00:00 2001
From: MueezKhan246 <93375917+MueezKhan246@users.noreply.github.com>
Date: Tue, 10 Sep 2024 16:11:51 +0000
Subject: [PATCH] feat: Upgrade Python dependency edx-enterprise and remove
 unencrypted client credentials

1. Upgraded Python dependency edx-enterprise
   - Added migration for removing unencrypted client credentials

2. Test updates
   - Unskipped `test_migrations_are_in_sync` after adding the migration

Commit generated by workflow `openedx/edx-platform/.github/workflows/upgrade-one-python-dependency.yml@refs/heads/master`
---
 common/djangoapps/util/tests/test_db.py | 4 ----
 requirements/constraints.txt            | 2 +-
 requirements/edx/base.txt               | 2 +-
 requirements/edx/development.txt        | 2 +-
 requirements/edx/doc.txt                | 2 +-
 requirements/edx/testing.txt            | 2 +-
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/common/djangoapps/util/tests/test_db.py b/common/djangoapps/util/tests/test_db.py
index 5d9be887a3..4a16c2a20a 100644
--- a/common/djangoapps/util/tests/test_db.py
+++ b/common/djangoapps/util/tests/test_db.py
@@ -1,6 +1,5 @@
 """Tests for util.db module."""
 
-import unittest
 from io import StringIO
 
 import ddt
@@ -121,9 +120,6 @@ class MigrationTests(TestCase):
     Tests for migrations.
     """
 
-    @unittest.skip(
-        "Temporary skip for ENT-8972 while the unencrypted client id and secret are removed from sap config."
-    )
     @override_settings(MIGRATION_MODULES={})
     def test_migrations_are_in_sync(self):
         """
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index fd6dac56af..fcde731374 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -26,7 +26,7 @@ celery>=5.2.2,<6.0.0
 # The team that owns this package will manually bump this package rather than having it pulled in automatically.
 # This is to allow them to better control its deployment and to do it in a process that works better
 # for them.
-edx-enterprise==4.25.7
+edx-enterprise==4.25.8
 
 # Stay on LTS version, remove once this is added to common constraint
 Django<5.0
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index f3108c6fdd..790c19f05a 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -467,7 +467,7 @@ edx-drf-extensions==10.3.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.25.7
+edx-enterprise==4.25.8
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 068b479624..d6e8c4d30a 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -741,7 +741,7 @@ edx-drf-extensions==10.3.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.25.7
+edx-enterprise==4.25.8
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index 1cc46ae3c4..eb73793835 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -547,7 +547,7 @@ edx-drf-extensions==10.3.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.25.7
+edx-enterprise==4.25.8
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 580745fbd3..11d31cb496 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -571,7 +571,7 @@ edx-drf-extensions==10.3.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.25.7
+edx-enterprise==4.25.8
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt