From 1178ad8b8b1015c1e10dcec3ccc5b4ed3954132b Mon Sep 17 00:00:00 2001
From: Troy Sankey <tsankey@edx.org>
Date: Wed, 4 Dec 2019 17:24:06 -0500
Subject: [PATCH] Rename order in CreditRequirement (3/3)

This stage does the following:

- Includes a migration to delete the old column.
- NO code changes.
---
 common/djangoapps/util/tests/test_db.py        |  1 -
 .../0008_creditrequirement_remove_order.py     | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 openedx/core/djangoapps/credit/migrations/0008_creditrequirement_remove_order.py

diff --git a/common/djangoapps/util/tests/test_db.py b/common/djangoapps/util/tests/test_db.py
index a4771255ee..ddeea5cb0f 100644
--- a/common/djangoapps/util/tests/test_db.py
+++ b/common/djangoapps/util/tests/test_db.py
@@ -222,7 +222,6 @@ class MigrationTests(TestCase):
     Tests for migrations.
     """
 
-    @unittest.skip("Need to skip as part of a 3-release rollout to rename a field in the credit app. This will be unskipped in DE-1823.")
     @override_settings(MIGRATION_MODULES={})
     def test_migrations_are_in_sync(self):
         """
diff --git a/openedx/core/djangoapps/credit/migrations/0008_creditrequirement_remove_order.py b/openedx/core/djangoapps/credit/migrations/0008_creditrequirement_remove_order.py
new file mode 100644
index 0000000000..0eb03ceb7f
--- /dev/null
+++ b/openedx/core/djangoapps/credit/migrations/0008_creditrequirement_remove_order.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('credit', '0007_creditrequirement_copy_values'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='creditrequirement',
+            name='order',
+        ),
+    ]