diff --git a/common/djangoapps/util/tests/test_db.py b/common/djangoapps/util/tests/test_db.py index 6a80944e5e..4a16c2a20a 100644 --- a/common/djangoapps/util/tests/test_db.py +++ b/common/djangoapps/util/tests/test_db.py @@ -1,7 +1,6 @@ """Tests for util.db module.""" from io import StringIO -from unittest import skip import ddt from django.core.management import call_command @@ -120,7 +119,7 @@ class MigrationTests(TestCase): """ Tests for migrations. """ - @skip + @override_settings(MIGRATION_MODULES={}) def test_migrations_are_in_sync(self): """ diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 42bdff9cec..9fa11228bb 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -25,7 +25,7 @@ django-storages<1.9 # 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==3.47.2 +edx-enterprise==3.48.0 # Newer versions need a more recent version of python-dateutil freezegun==0.3.12 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 56e8d36115..08329169a7 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -470,7 +470,7 @@ edx-drf-extensions==8.0.1 # edx-rbac # edx-when # edxval -edx-enterprise==3.47.2 +edx-enterprise==3.48.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index ecd2416bd4..a3fba0f114 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -583,7 +583,7 @@ edx-drf-extensions==8.0.1 # edx-rbac # edx-when # edxval -edx-enterprise==3.47.2 +edx-enterprise==3.48.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 3b96951ef2..ddecfae65e 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -566,7 +566,7 @@ edx-drf-extensions==8.0.1 # edx-rbac # edx-when # edxval -edx-enterprise==3.47.2 +edx-enterprise==3.48.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt