From efd0b878bf4ed0f7fa1d61f0c12f3e170442f4cf Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Wed, 24 Oct 2018 19:59:50 +0200 Subject: [PATCH] Remove unnecessary migration --- .../0028_feature-flag-mkdocs-theme.py | 35 ------------------- .../rtd_tests/tests/test_doc_builder.py | 7 ++-- 2 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 readthedocs/projects/migrations/0028_feature-flag-mkdocs-theme.py diff --git a/readthedocs/projects/migrations/0028_feature-flag-mkdocs-theme.py b/readthedocs/projects/migrations/0028_feature-flag-mkdocs-theme.py deleted file mode 100644 index 6f53d27443c..00000000000 --- a/readthedocs/projects/migrations/0028_feature-flag-mkdocs-theme.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.16 on 2018-10-24 07:43 -from __future__ import unicode_literals - -from django.db import migrations - - -FEATURE_ID = 'mkdocs_theme_rtd' - - -def forward_add_feature(apps, schema_editor): - Feature = apps.get_model('projects', 'Feature') - Feature.objects.create( - feature_id=FEATURE_ID, - # Not using ``default_true=True`` because we will do this manually in - # the database from the Corporate site only, since this is not required - # in the Community site - # default_true=True, - ) - - -def reverse_add_feature(apps, schema_editor): - Feature = apps.get_model('projects', 'Feature') - Feature.objects.filter(feature_id=FEATURE_ID).delete() - - -class Migration(migrations.Migration): - - dependencies = [ - ('projects', '0027_remove_json_with_html_feature'), - ] - - operations = [ - migrations.RunPython(forward_add_feature, reverse_add_feature), - ] diff --git a/readthedocs/rtd_tests/tests/test_doc_builder.py b/readthedocs/rtd_tests/tests/test_doc_builder.py index 5da0fccc4fe..154ace66c5d 100644 --- a/readthedocs/rtd_tests/tests/test_doc_builder.py +++ b/readthedocs/rtd_tests/tests/test_doc_builder.py @@ -229,9 +229,12 @@ def test_get_theme_name(self, checkout_path): def test_get_theme_name_with_feature_flag(self, checkout_path, run): tmpdir = tempfile.mkdtemp() checkout_path.return_value = tmpdir - Feature.objects.get( + + feature = get( + Feature, feature_id=Feature.MKDOCS_THEME_RTD, - ).projects.add(self.project) + ) + feature.projects.add(self.project) python_env = Virtualenv( version=self.version,