Update to working django commit, re-do migrations, remove unused util…

…s.imports
mailme · Apr 22, 2014 · a2f7b7c · a2f7b7c
1 parent d3297e2
commit a2f7b7c
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 108 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 -e git+https://github.com/celery/billiard.git@4ef9874290b8df47b2e264412b6404592454f6e1#egg=billiard
 
 # We depend on Django 1.7
--e git+https://github.com/django/django.git@stable/1.7.x#egg=django
+-e git+https://github.com/django/django.git@b06e45bbf6988f9f8671bbc5b5b63d419d50edda#egg=django
diff --git a/src/mailme/migrations/0001_initial.py b/src/mailme/migrations/0001_initial.py
@@ -12,81 +12,77 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='Enclosure',
+            name='Category',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', primary_key=True, serialize=False, auto_created=True)),
-                ('url', models.URLField(verbose_name='URL')),
-                ('type', models.CharField(verbose_name='type', max_length=200)),
-                ('length', models.PositiveIntegerField(verbose_name='length', default=0)),
+                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
+                ('title', models.CharField(max_length=200, verbose_name='title')),
+                ('domain', models.CharField(max_length=200, null=True, blank=True, verbose_name='domain')),
             ],
             options={
-                'verbose_name': 'enclosure',
-                'verbose_name_plural': 'enclosures',
-                'db_table': 'mailme_enclosure',
+                'unique_together': set([('title', 'domain')]),
+                'verbose_name_plural': 'categories',
+                'verbose_name': 'category',
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
-            name='Category',
+            name='Enclosure',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', primary_key=True, serialize=False, auto_created=True)),
-                ('title', models.CharField(verbose_name='title', max_length=200)),
-                ('domain', models.CharField(verbose_name='domain', blank=True, max_length=200, null=True)),
+                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
+                ('url', models.URLField(verbose_name='URL')),
+                ('type', models.CharField(max_length=200, verbose_name='type')),
+                ('length', models.PositiveIntegerField(default=0, verbose_name='length')),
             ],
             options={
-                'verbose_name': 'category',
-                'unique_together': set([('title', 'domain')]),
-                'verbose_name_plural': 'categories',
-                'db_table': 'mailme_category',
+                'verbose_name_plural': 'enclosures',
+                'verbose_name': 'enclosure',
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='User',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', primary_key=True, serialize=False, auto_created=True)),
-                ('password', models.CharField(verbose_name='password', max_length=128)),
-                ('last_login', models.DateTimeField(verbose_name='last login', default=django.utils.timezone.now)),
-                ('username', models.CharField(verbose_name='Username', max_length=50, unique=True, null=True)),
-                ('email', models.EmailField(verbose_name='Email', max_length=254, unique=True)),
-                ('name', models.CharField(verbose_name='Name', blank=True, max_length=100, null=True)),
-                ('is_staff', models.BooleanField(verbose_name='staff status', help_text='Designates whether the user can log into this admin site.', default=False)),
-                ('is_active', models.BooleanField(verbose_name='active', help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', default=True)),
-                ('is_superuser', models.BooleanField(verbose_name='superuser status', help_text='Designates that this user has all permissions without explicitly assigning them.', default=False)),
-                ('date_joined', models.DateTimeField(verbose_name='date joined', default=django.utils.timezone.now)),
+                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
+                ('password', models.CharField(max_length=128, verbose_name='password')),
+                ('last_login', models.DateTimeField(default=django.utils.timezone.now, verbose_name='last login')),
+                ('username', models.CharField(max_length=50, null=True, verbose_name='Username', unique=True)),
+                ('email', models.EmailField(max_length=254, verbose_name='Email', unique=True)),
+                ('name', models.CharField(max_length=100, null=True, blank=True, verbose_name='Name')),
+                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
+                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
+                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
                 ('email_verified', models.BooleanField(default=False)),
                 ('enable_notifications', models.BooleanField(default=False)),
             ],
             options={
-                'verbose_name': 'User',
                 'verbose_name_plural': 'Users',
-                'db_table': 'mailme_user',
+                'verbose_name': 'User',
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Feed',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', primary_key=True, serialize=False, auto_created=True)),
+                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
                 ('title', models.TextField(verbose_name='title')),
-                ('feed_url', models.URLField(verbose_name='feed URL', max_length=2048, unique=True)),
+                ('feed_url', models.URLField(max_length=2048, verbose_name='feed URL', unique=True)),
                 ('description', models.TextField(verbose_name='description')),
-                ('link', models.URLField(verbose_name='link', blank=True, max_length=2048)),
-                ('http_etag', models.CharField(verbose_name='E-Tag', blank=True, max_length=200, editable=False, null=True)),
-                ('http_last_modified', models.DateTimeField(verbose_name='Last-Modified', blank=True, editable=False, null=True)),
-                ('date_last_refresh', models.DateTimeField(verbose_name='date of last refresh', blank=True, editable=False, null=True)),
-                ('last_error', models.CharField(verbose_name='last error', blank=True, choices=[('TIMEDOUT_ERROR', 'The feed does not seem to be respond. We will try again later.'), ('NOT_FOUND_ERROR', 'You entered an incorrect URL or the feed you requested does not exist anymore.'), ('GENERIC_ERROR', 'There was a problem with the feed you provided, please check the URL for mispellings or try again later.')], max_length=32, default='')),
+                ('link', models.URLField(max_length=2048, blank=True, verbose_name='link')),
+                ('http_etag', models.CharField(max_length=200, null=True, blank=True, verbose_name='E-Tag', editable=False)),
+                ('http_last_modified', models.DateTimeField(null=True, editable=False, blank=True, verbose_name='Last-Modified')),
+                ('date_last_refresh', models.DateTimeField(null=True, editable=False, blank=True, verbose_name='date of last refresh')),
+                ('last_error', models.CharField(max_length=32, default='', blank=True, verbose_name='last error', choices=[('TIMEDOUT_ERROR', 'The feed does not seem to be respond. We will try again later.'), ('NOT_FOUND_ERROR', 'You entered an incorrect URL or the feed you requested does not exist anymore.'), ('GENERIC_ERROR', 'There was a problem with the feed you provided, please check the URL for mispellings or try again later.')])),
                 ('date_created', models.DateTimeField(verbose_name='date created', auto_now_add=True)),
-                ('date_changed', models.DateTimeField(verbose_name='date changed', auto_now=True)),
-                ('is_active', models.BooleanField(verbose_name='is active', default=True)),
-                ('freq', models.IntegerField(verbose_name='frequency', default=10800)),
+                ('date_changed', models.DateTimeField(auto_now=True, verbose_name='date changed')),
+                ('is_active', models.BooleanField(default=True, verbose_name='is active')),
+                ('freq', models.IntegerField(default=10800, verbose_name='frequency')),
                 ('categories', models.ManyToManyField(to='mailme.Category')),
             ],
             options={
-                'verbose_name': 'syndication feed',
-                'ordering': ('id',),
                 'verbose_name_plural': 'syndication feeds',
-                'db_table': 'mailme_feed',
+                'ordering': ('id',),
+                'verbose_name': 'syndication feed',
             },
             bases=(models.Model,),
         ),

diff --git a/src/mailme/migrations/0002_post.py b/src/mailme/migrations/0002_post.py
@@ -15,22 +15,21 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Post',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', primary_key=True, serialize=False, auto_created=True)),
-                ('feed', models.ForeignKey(to_field='id', to='mailme.Feed')),
+                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
+                ('feed', models.ForeignKey(to='mailme.Feed', to_field='id')),
                 ('title', models.TextField(verbose_name='title')),
-                ('link', models.URLField(verbose_name='link', max_length=2048)),
-                ('content', models.TextField(verbose_name='content', blank=True)),
-                ('guid', models.CharField(verbose_name='guid', blank=True, max_length=2048)),
-                ('author', models.TextField(verbose_name='author', blank=True)),
-                ('published', models.DateTimeField(verbose_name='date published', default=django.utils.timezone.now)),
-                ('updated', models.DateTimeField(verbose_name='date updated', default=django.utils.timezone.now)),
-                ('enclosures', models.ManyToManyField(blank=True, to='mailme.Enclosure')),
+                ('link', models.URLField(max_length=2048, verbose_name='link')),
+                ('content', models.TextField(blank=True, verbose_name='content')),
+                ('guid', models.CharField(max_length=2048, blank=True, verbose_name='guid')),
+                ('author', models.TextField(blank=True, verbose_name='author')),
+                ('published', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date published')),
+                ('updated', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date updated')),
+                ('enclosures', models.ManyToManyField(to='mailme.Enclosure', blank=True)),
                 ('categories', models.ManyToManyField(to='mailme.Category')),
             ],
             options={
-                'verbose_name': 'post',
                 'verbose_name_plural': 'posts',
-                'db_table': 'mailme_post',
+                'verbose_name': 'post',
             },
             bases=(models.Model,),
         ),

diff --git a/src/mailme/migrations/0003_user.py b/src/mailme/migrations/0003_user.py
diff --git a/src/mailme/utils/imports.py b/src/mailme/utils/imports.py