From c65828738690e26e24b4193271af0c357124d48f Mon Sep 17 00:00:00 2001
From: MueezKhan246 <93375917+MueezKhan246@users.noreply.github.com>
Date: Fri, 6 Sep 2024 09:18:43 +0000
Subject: [PATCH] feat: Upgrade Python dependency edx-enterprise and re-enable
 migrations test

- Upgraded Python dependency `edx-enterprise` and updated relevant requirements files.
- Added migration file to remove `char field decrypted_secret`.
- Re-enabled `test_migrations_are_in_sync` by unskipping the test.

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 849ba44b5d..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 char field decrypted client secret columns in SAP is removed."
-    )
     @override_settings(MIGRATION_MODULES={})
     def test_migrations_are_in_sync(self):
         """
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 93c6517719..e930233e11 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.1
+edx-enterprise==4.25.2
 
 # 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 f253f9eabb..fca1ed211b 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.1
+edx-enterprise==4.25.2
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 7dc30cc2b7..196ef85d92 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.1
+edx-enterprise==4.25.2
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index 7841c2e0bf..38460c744d 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.1
+edx-enterprise==4.25.2
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index ae093ab77e..0d02245b40 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.1
+edx-enterprise==4.25.2
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt