Updated to Django 1.7

README.txt

@@ -27,12 +27,10 @@ To run locally, do the usual::
 
     psql -d code.djangoproject < tracdb/trac.sql
 
-    ./manage.py syncdb
     ./manage.py migrate
 
    and::
 
-    ./manage.py syncdb --docs
     ./manage.py migrate --docs
 
    if you want to run docs site.

accounts/migrations/0001_initial.py

@@ -1,71 +1,26 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
-class Migration(SchemaMigration):
+from django.db import models, migrations
+from django.conf import settings
 
-    def forwards(self, orm):
-
-        # Adding model 'Profile'
-        db.create_table('accounts_profile', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=200, blank=True)),
-        ))
-        db.send_create_signal('accounts', ['Profile'])
 
+class Migration(migrations.Migration):
 
-    def backwards(self, orm):
-
-        # Deleting model 'Profile'
-        db.delete_table('accounts_profile')
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
 
-
-    models = {
-        'accounts.profile': {
-            'Meta': {'object_name': 'Profile'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
-        },
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['accounts']
+    operations = [
+        migrations.CreateModel(
+            name='Profile',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=200, blank=True)),
+                ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]

aggregator/migrations/0001_initial.py

@@ -1,85 +1,68 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
-class Migration(SchemaMigration):
+from django.db import models, migrations
+from django.conf import settings
 
-    def forwards(self, orm):
-
-        # Adding model 'FeedType'
-        db.create_table('aggregator_feedtype', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=250)),
-            ('slug', self.gf('django.db.models.fields.SlugField')(max_length=250, db_index=True)),
-            ('can_self_add', self.gf('django.db.models.fields.BooleanField')(default=True)),
-        ))
-        db.send_create_signal('aggregator', ['FeedType'])
 
-        # Adding model 'Feed'
-        db.create_table('aggregator_feeds', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('title', self.gf('django.db.models.fields.CharField')(max_length=500)),
-            ('feed_url', self.gf('django.db.models.fields.URLField')(unique=True, max_length=500)),
-            ('public_url', self.gf('django.db.models.fields.URLField')(max_length=500)),
-            ('is_defunct', self.gf('django.db.models.fields.BooleanField')(default=False)),
-            ('feed_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['aggregator.FeedType'])),
-        ))
-        db.send_create_signal('aggregator', ['Feed'])
+class Migration(migrations.Migration):
 
-        # Adding model 'FeedItem'
-        db.create_table('aggregator_feeditems', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('feed', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['aggregator.Feed'])),
-            ('title', self.gf('django.db.models.fields.CharField')(max_length=500)),
-            ('link', self.gf('django.db.models.fields.URLField')(max_length=500)),
-            ('summary', self.gf('django.db.models.fields.TextField')(blank=True)),
-            ('date_modified', self.gf('django.db.models.fields.DateTimeField')()),
-            ('guid', self.gf('django.db.models.fields.CharField')(unique=True, max_length=500, db_index=True)),
-        ))
-        db.send_create_signal('aggregator', ['FeedItem'])
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
 
-
-    def backwards(self, orm):
-
-        # Deleting model 'FeedType'
-        db.delete_table('aggregator_feedtype')
-
-        # Deleting model 'Feed'
-        db.delete_table('aggregator_feeds')
-
-        # Deleting model 'FeedItem'
-        db.delete_table('aggregator_feeditems')
-
-
-    models = {
-        'aggregator.feed': {
-            'Meta': {'object_name': 'Feed', 'db_table': "'aggregator_feeds'"},
-            'feed_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['aggregator.FeedType']"}),
-            'feed_url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '500'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_defunct': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'public_url': ('django.db.models.fields.URLField', [], {'max_length': '500'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '500'})
-        },
-        'aggregator.feeditem': {
-            'Meta': {'ordering': "('-date_modified',)", 'object_name': 'FeedItem', 'db_table': "'aggregator_feeditems'"},
-            'date_modified': ('django.db.models.fields.DateTimeField', [], {}),
-            'feed': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['aggregator.Feed']"}),
-            'guid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '500', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'link': ('django.db.models.fields.URLField', [], {'max_length': '500'}),
-            'summary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '500'})
-        },
-        'aggregator.feedtype': {
-            'Meta': {'object_name': 'FeedType'},
-            'can_self_add': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '250'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '250', 'db_index': 'True'})
-        }
-    }
-
-    complete_apps = ['aggregator']
+    operations = [
+        migrations.CreateModel(
+            name='Feed',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('title', models.CharField(max_length=500)),
+                ('feed_url', models.URLField(unique=True, max_length=500)),
+                ('public_url', models.URLField(max_length=500)),
+                ('approval_status', models.CharField(default='P', max_length=1, choices=[('P', 'Pending'), ('D', 'Denied'), ('A', 'Approved')])),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='FeedItem',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('title', models.CharField(max_length=500)),
+                ('link', models.URLField(max_length=500)),
+                ('summary', models.TextField(blank=True)),
+                ('date_modified', models.DateTimeField()),
+                ('guid', models.CharField(unique=True, max_length=500, db_index=True)),
+                ('feed', models.ForeignKey(to='aggregator.Feed')),
+            ],
+            options={
+                'ordering': ('-date_modified',),
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='FeedType',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=250)),
+                ('slug', models.SlugField(max_length=250)),
+                ('can_self_add', models.BooleanField(default=True)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.AddField(
+            model_name='feed',
+            name='feed_type',
+            field=models.ForeignKey(to='aggregator.FeedType'),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='feed',
+            name='owner',
+            field=models.ForeignKey(related_name='owned_feeds', blank=True, to=settings.AUTH_USER_MODEL, null=True),
+            preserve_default=True,
+        ),
+    ]

aggregator/migrations/0002_add_feed_approver_auth_group.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+def forwards_func(apps, schema_editor):
+    if schema_editor.connection.alias == 'default':
+        apps.get_model('auth', 'Group').objects.create(name=settings.FEED_APPROVERS_GROUP_NAME)
+
+
+def reverse_func(apps, schema_editor):
+    if schema_editor.connection.alias == 'default':
+        apps.get_model('auth', 'Group').objects.get(name=settings.FEED_APPROVERS_GROUP_NAME).delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('aggregator', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func, reverse_func),
+    ]