From e2d9ecc0100b801f4529ee1568e545d42096a826 Mon Sep 17 00:00:00 2001 From: muzaffaryousaf Date: Tue, 29 Mar 2016 15:08:42 +0500 Subject: [PATCH] Make migrations in-sync with models --- .../migrations/0002_auto_20160325_0407.py | 24 +++++++++++++++++++ common/djangoapps/util/tests/test_db.py | 6 +++-- .../migrations/0003_auto_20160329_0709.py | 18 ++++++++++++++ .../migrations/0002_auto_20160325_0407.py | 20 ++++++++++++++++ .../migrations/0002_auto_20160325_0407.py | 18 ++++++++++++++ .../migrations/0002_auto_20160325_0631.py | 19 +++++++++++++++ .../migrations/0002_auto_20160325_0631.py | 18 ++++++++++++++ 7 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 common/djangoapps/third_party_auth/migrations/0002_auto_20160325_0407.py create mode 100644 lms/djangoapps/commerce/migrations/0003_auto_20160329_0709.py create mode 100644 lms/djangoapps/lti_provider/migrations/0002_auto_20160325_0407.py create mode 100644 openedx/core/djangoapps/ccxcon/migrations/0002_auto_20160325_0407.py create mode 100644 openedx/core/djangoapps/coursetalk/migrations/0002_auto_20160325_0631.py create mode 100644 openedx/core/djangoapps/credentials/migrations/0002_auto_20160325_0631.py diff --git a/common/djangoapps/third_party_auth/migrations/0002_auto_20160325_0407.py b/common/djangoapps/third_party_auth/migrations/0002_auto_20160325_0407.py new file mode 100644 index 0000000000..d697b75126 --- /dev/null +++ b/common/djangoapps/third_party_auth/migrations/0002_auto_20160325_0407.py @@ -0,0 +1,24 @@ +# -*- 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')]), + ), + ] diff --git a/common/djangoapps/util/tests/test_db.py b/common/djangoapps/util/tests/test_db.py index 40650372c7..75895e5e48 100644 --- a/common/djangoapps/util/tests/test_db.py +++ b/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. diff --git a/lms/djangoapps/commerce/migrations/0003_auto_20160329_0709.py b/lms/djangoapps/commerce/migrations/0003_auto_20160329_0709.py new file mode 100644 index 0000000000..814d57450f --- /dev/null +++ b/lms/djangoapps/commerce/migrations/0003_auto_20160329_0709.py @@ -0,0 +1,18 @@ +# -*- 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={}, + ), + ] diff --git a/lms/djangoapps/lti_provider/migrations/0002_auto_20160325_0407.py b/lms/djangoapps/lti_provider/migrations/0002_auto_20160325_0407.py new file mode 100644 index 0000000000..232a1e6c00 --- /dev/null +++ b/lms/djangoapps/lti_provider/migrations/0002_auto_20160325_0407.py @@ -0,0 +1,20 @@ +# -*- 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), + ), + ] diff --git a/openedx/core/djangoapps/ccxcon/migrations/0002_auto_20160325_0407.py b/openedx/core/djangoapps/ccxcon/migrations/0002_auto_20160325_0407.py new file mode 100644 index 0000000000..ffb6ee7d68 --- /dev/null +++ b/openedx/core/djangoapps/ccxcon/migrations/0002_auto_20160325_0407.py @@ -0,0 +1,18 @@ +# -*- 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'}, + ), + ] diff --git a/openedx/core/djangoapps/coursetalk/migrations/0002_auto_20160325_0631.py b/openedx/core/djangoapps/coursetalk/migrations/0002_auto_20160325_0631.py new file mode 100644 index 0000000000..73f04f9065 --- /dev/null +++ b/openedx/core/djangoapps/coursetalk/migrations/0002_auto_20160325_0631.py @@ -0,0 +1,19 @@ +# -*- 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), + ), + ] diff --git a/openedx/core/djangoapps/credentials/migrations/0002_auto_20160325_0631.py b/openedx/core/djangoapps/credentials/migrations/0002_auto_20160325_0631.py new file mode 100644 index 0000000000..5cafeda4e1 --- /dev/null +++ b/openedx/core/djangoapps/credentials/migrations/0002_auto_20160325_0631.py @@ -0,0 +1,18 @@ +# -*- 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={}, + ), + ]