diff --git a/ietf/settings_releasetest.py b/ietf/settings_releasetest.py index 150af047d..86826736d 100644 --- a/ietf/settings_releasetest.py +++ b/ietf/settings_releasetest.py @@ -11,20 +11,13 @@ from settings import * # pyflakes:ignore # the test database instead of doing it through the migrations. Taken from # https://gist.github.com/NotSqrt/5f3c76cd15e40ef62d09 -## To be removed after upgrade to Django 1.8 ## - class DisableMigrations(object): def __contains__(self, item): return True def __getitem__(self, item): - # The string below is significant. It has to include the value of - # django.db.migrations.loader.MIGRATIONS_MODULE_NAME. Used by django - # 1.7 code in django.db.migrations.loader.MigrationLoader to - # determine whether or not to run migrations for a given module - from django.db.migrations.loader import MIGRATIONS_MODULE_NAME - return "no " + MIGRATIONS_MODULE_NAME + return None MIGRATION_MODULES = DisableMigrations() diff --git a/ietf/settings_sqlitetest.py b/ietf/settings_sqlitetest.py index 6180cacaa..f6f471ee6 100644 --- a/ietf/settings_sqlitetest.py +++ b/ietf/settings_sqlitetest.py @@ -15,24 +15,17 @@ debug.debug = True # the test database instead of doing it through the migrations. Taken from # https://gist.github.com/NotSqrt/5f3c76cd15e40ef62d09 -## To be removed after upgrade to Django 1.8 ## - class DisableMigrations(object): def __contains__(self, item): return True def __getitem__(self, item): - from django.db.migrations.loader import MIGRATIONS_MODULE_NAME - # The string below is significant. It has to include the value of - # django.db.migrations.loader.MIGRATIONS_MODULE_NAME. Used by django - # 1.7 code in django.db.migrations.loader.MigrationLoader to - # determine whether or not to run migrations for a given module. - # By returning a non-existent path, we ignore migrations. - return "no_" + MIGRATIONS_MODULE_NAME + return None MIGRATION_MODULES = DisableMigrations() + DATABASES = { 'default': { 'NAME': 'test.db',