Make migrations in-sync with models

common/djangoapps/third_party_auth/migrations/0002_auto_20160325_0407.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('third_party_auth', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='oauth2providerconfig',
+            name='backend_name',
+            field=models.CharField(help_text=b'Which python-social-auth OAuth2 provider backend to use. The list of backend choices is determined by the THIRD_PARTY_AUTH_BACKENDS setting.', max_length=50, db_index=True, choices=[(b'google-oauth2', b'google-oauth2'), (b'linkedin-oauth2', b'linkedin-oauth2'), (b'facebook', b'facebook'), (b'twitter', b'twitter'), (b'dummy', b'dummy')]),
+        ),
+        migrations.AlterField(
+            model_name='samlproviderconfig',
+            name='backend_name',
+            field=models.CharField(default=b'tpa-saml', help_text=b"Which python-social-auth provider backend to use. 'tpa-saml' is the standard edX SAML backend.", max_length=50, choices=[(b'tpa-saml', b'tpa-saml')]),
+        ),
+    ]

common/djangoapps/util/tests/test_db.py

@@ -4,14 +4,16 @@ import ddt
 import threading
 import time
 import unittest
+from unittest import skipIf
 
 from django.contrib.auth.models import User
 from django.core.management import call_command
+from django.conf import settings
 from django.db import connection, IntegrityError
 from django.db.transaction import atomic, TransactionManagementError
 from django.test import TestCase, TransactionTestCase
 
-from util.db import commit_on_success, generate_int_id, outer_atomic
+from util.db import commit_on_success, generate_int_id, outer_atomic, NoOpMigrationModules
 
 
 @ddt.ddt
@@ -168,7 +170,7 @@ class MigrationTests(TestCase):
     """
     Tests for migrations.
     """
-
+    @skipIf(isinstance(settings.MIGRATION_MODULES, NoOpMigrationModules), 'Skip in case of NoOpMigrationModules')
     def test_migrations_are_in_sync(self):
         """
         Tests that the migration files are in sync with the models.

lms/djangoapps/commerce/migrations/0003_auto_20160329_0709.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('commerce', '0002_commerceconfiguration'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='commerceconfiguration',
+            options={},
+        ),
+    ]

lms/djangoapps/lti_provider/migrations/0002_auto_20160325_0407.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import provider.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lti_provider', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='lticonsumer',
+            name='consumer_secret',
+            field=models.CharField(default=provider.utils.short_token, unique=True, max_length=32),
+        ),
+    ]

openedx/core/djangoapps/ccxcon/migrations/0002_auto_20160325_0407.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ccxcon', '0001_initial_ccxcon_model'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='ccxcon',
+            options={'verbose_name': 'CCX Connector', 'verbose_name_plural': 'CCX Connectors'},
+        ),
+    ]

openedx/core/djangoapps/coursetalk/migrations/0002_auto_20160325_0631.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('coursetalk', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='coursetalkwidgetconfiguration',
+            name='platform_key',
+            field=models.CharField(help_text='The platform key associates CourseTalk widgets with your platform. Generally, it is the domain name for your platform. For example, if your platform is http://edx.org, the platform key is "edx".', max_length=50),
+        ),
+    ]

openedx/core/djangoapps/credentials/migrations/0002_auto_20160325_0631.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('credentials', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='credentialsapiconfig',
+            options={},
+        ),
+    ]