Merge pull request #11 from divio/migrations_gyration

Migrations gyration

Author: mkoistinen

MANIFEST.in

@@ -1,5 +1,5 @@
 include LICENSE.txt
-include README.md
+include README.rst
 recursive-include djangocms_file/locale *
 recursive-include djangocms_file/templates *
 recursive-exclude * *.py[co]

README.md

@@ -9,12 +9,11 @@ Installation
 
 This plugin requires `django CMS` 3.0 or higher to be properly installed.
 
-* In your projects `virtualenv`_, run ``pip install djangocms-file``.
+* In your projects `virtualenv`, run ``pip install djangocms-file``.
 * Add ``'djangocms_file'`` to your ``INSTALLED_APPS`` setting.
-* If using Django 1.7 add ``'djangocms_file': 'djangocms_file.migrations_django',``
-  to ``MIGRATION_MODULES``  (or define ``MIGRATION_MODULES`` if it does not exists);
-  when django CMS 3.1 will be released, migrations for Django 1.7 will be moved
-  to the standard location and the south-style ones to ``south_migrations``.
+* If using Django 1.6 and South < 1.0.2 add ``'djangocms_file': 'djangocms_file.south_migrations',``
+  to ``SOUTH_MIGRATION_MODULES``  (or define ``SOUTH_MIGRATION_MODULES`` if it
+  does not exists);
 * Run ``manage.py migrate djangocms_file``.
 
 

djangocms_file/migrations/0001_initial.py

@@ -1,61 +1,28 @@
 # -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models, connection
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        table_names = connection.introspection.table_names()
-        if 'cmsplugin_file' in table_names:
-            db.rename_table('cmsplugin_file', 'djangocms_file_file')
-        elif 'file_file' in table_names:
-            db.rename_table('file_file', 'djangocms_file_file')
-        else:
-            # Adding model 'File'
-            db.create_table(u'djangocms_file_file', (
-                (u'cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)),
-                ('file', self.gf('django.db.models.fields.files.FileField')(max_length=100)),
-                ('title', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
-            ))
-            db.send_create_signal(u'djangocms_file', ['File'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'File'
-        db.delete_table(u'djangocms_file_file')
-
-
-    models = {
-        'cms.cmsplugin': {
-            'Meta': {'object_name': 'CMSPlugin'},
-            'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
-            'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
-            'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
-            'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
-            'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
-        },
-        'cms.placeholder': {
-            'Meta': {'object_name': 'Placeholder'},
-            'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'slot': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'})
-        },
-        u'djangocms_file.file': {
-            'Meta': {'object_name': 'File', '_ormbases': ['cms.CMSPlugin']},
-            u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}),
-            'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['djangocms_file']
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import cms.models.pluginmodel
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '__first__'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='File',
+            fields=[
+                ('cmsplugin_ptr', models.OneToOneField(serialize=False, parent_link=True, auto_created=True, to='cms.CMSPlugin', primary_key=True)),
+                ('file', models.FileField(verbose_name='file', upload_to=cms.models.pluginmodel.get_plugin_media_path)),
+                ('title', models.CharField(verbose_name='title', blank=True, null=True, max_length=255)),
+                ('target', models.CharField(verbose_name='target', blank=True, default='', max_length=100, choices=[('', 'same window'), ('_blank', 'new window'), ('_parent', 'parent window'), ('_top', 'topmost frame')])),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('cms.cmsplugin',),
+        ),
+    ]

djangocms_file/migrations_django/0002_auto_20151202_1551.py renamed to djangocms_file/migrations/0002_auto_20151202_1551.py

@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models, connection
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        table_names = connection.introspection.table_names()
+        if 'cmsplugin_file' in table_names:
+            db.rename_table('cmsplugin_file', 'djangocms_file_file')
+        elif 'file_file' in table_names:
+            db.rename_table('file_file', 'djangocms_file_file')
+        else:
+            # Adding model 'File'
+            db.create_table(u'djangocms_file_file', (
+                (u'cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)),
+                ('file', self.gf('django.db.models.fields.files.FileField')(max_length=100)),
+                ('title', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+            ))
+            db.send_create_signal(u'djangocms_file', ['File'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'File'
+        db.delete_table(u'djangocms_file_file')
+
+
+    models = {
+        'cms.cmsplugin': {
+            'Meta': {'object_name': 'CMSPlugin'},
+            'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+            'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+            'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
+            'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
+            'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+            'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+            'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
+        },
+        'cms.placeholder': {
+            'Meta': {'object_name': 'Placeholder'},
+            'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'slot': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'})
+        },
+        u'djangocms_file.file': {
+            'Meta': {'object_name': 'File', '_ormbases': ['cms.CMSPlugin']},
+            u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}),
+            'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['djangocms_file']

djangocms_file/migrations_django/0001_initial.py

@@ -28,7 +28,7 @@
     packages=[
         'djangocms_file',
         'djangocms_file.migrations',
-        'djangocms_file.migrations_django'
+        'djangocms_file.south_migrations'
     ],
     license='LICENSE.txt',
     platforms=['OS Independent'],