Skip to content

Commit

Permalink
Merge pull request #35462 from openedx/MueezKhan246/upgrade-edx-enter…
Browse files Browse the repository at this point in the history
…prise-08bd8b3

feat: Upgrade Python dependency edx-enterprise
  • Loading branch information
MueezKhan246 authored Sep 10, 2024
2 parents 4b827bf + faa0209 commit 241b3c9
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 5 deletions.
4 changes: 4 additions & 0 deletions common/djangoapps/util/tests/test_db.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""Tests for util.db module."""

import unittest
from io import StringIO

import ddt
Expand Down Expand Up @@ -120,6 +121,9 @@ 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):
"""
Expand Down
2 changes: 1 addition & 1 deletion requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.6
edx-enterprise==4.25.7

# Stay on LTS version, remove once this is added to common constraint
Django<5.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ edx-drf-extensions==10.3.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.25.6
edx-enterprise==4.25.7
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ edx-drf-extensions==10.3.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.25.6
edx-enterprise==4.25.7
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/doc.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ edx-drf-extensions==10.3.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.25.6
edx-enterprise==4.25.7
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ edx-drf-extensions==10.3.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.25.6
edx-enterprise==4.25.7
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
Expand Down

0 comments on commit 241b3c9

Please sign in to comment.