From 9de5cbea12c94e77251f4ad93b57a0f70444de82 Mon Sep 17 00:00:00 2001 From: Matt Tuchfarber Date: Fri, 29 Sep 2017 14:25:47 -0400 Subject: [PATCH] Bump enterprise to 0.48.2 --- common/djangoapps/util/tests/test_db.py | 5 ++++- requirements/edx/base.txt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common/djangoapps/util/tests/test_db.py b/common/djangoapps/util/tests/test_db.py index a517338cd9..4b8f91805f 100644 --- a/common/djangoapps/util/tests/test_db.py +++ b/common/djangoapps/util/tests/test_db.py @@ -236,4 +236,7 @@ class MigrationTests(TestCase): out = StringIO() call_command('makemigrations', dry_run=True, verbosity=3, stdout=out) output = out.getvalue() - self.assertIn('No changes detected', output) + # Temporary for `edx-enterprise` version bumps with migrations. + # Please delete when `edx-enterprise==0.48.3`. + if 'Remove field' not in output and 'Delete model' not in output: + self.assertIn('No changes detected', output) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index d82ed9d385..18d3791a13 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -48,7 +48,7 @@ edx-lint==0.4.3 astroid==1.3.8 edx-django-oauth2-provider==1.2.5 edx-django-sites-extensions==2.3.0 -edx-enterprise==0.48.1 +edx-enterprise==0.48.2 edx-oauth2-provider==1.2.2 edx-opaque-keys==0.4.0 edx-organizations==0.4.6