diff options
13 files changed, 121 insertions, 962 deletions
diff --git a/newsdiff/core/migrations/0001_initial.py b/newsdiff/core/migrations/0001_initial.py index aae52af..6b59a71 100644 --- a/newsdiff/core/migrations/0001_initial.py +++ b/newsdiff/core/migrations/0001_initial.py @@ -1,144 +1,90 @@ # -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models +from __future__ import unicode_literals +from django.db import models, migrations +import django.core.validators +import django.contrib.auth.models +import django.utils.timezone -class Migration(SchemaMigration): - needed_by = ( - ('reversion', '0001_initial'), - ) +class Migration(migrations.Migration): - def forwards(self, orm): - # Adding model 'NewsDiffUser' - db.create_table(u'core_newsdiffuser', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('password', self.gf('django.db.models.fields.CharField')(max_length=128)), - ('last_login', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), - ('is_superuser', self.gf('django.db.models.fields.BooleanField')(default=False)), - ('username', self.gf('django.db.models.fields.CharField')(unique=True, max_length=30)), - ('first_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), - ('last_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), - ('email', self.gf('django.db.models.fields.EmailField')(max_length=75, blank=True)), - ('is_staff', self.gf('django.db.models.fields.BooleanField')(default=False)), - ('is_active', self.gf('django.db.models.fields.BooleanField')(default=True)), - ('date_joined', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), - )) - db.send_create_signal(u'core', ['NewsDiffUser']) + dependencies = [ + ('auth', '0006_require_contenttypes_0002'), + ] - # Adding M2M table for field groups on 'NewsDiffUser' - m2m_table_name = db.shorten_name(u'core_newsdiffuser_groups') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('newsdiffuser', models.ForeignKey(orm[u'core.newsdiffuser'], null=False)), - ('group', models.ForeignKey(orm[u'auth.group'], null=False)) - )) - db.create_unique(m2m_table_name, ['newsdiffuser_id', 'group_id']) - - # Adding M2M table for field user_permissions on 'NewsDiffUser' - m2m_table_name = db.shorten_name(u'core_newsdiffuser_user_permissions') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('newsdiffuser', models.ForeignKey(orm[u'core.newsdiffuser'], null=False)), - ('permission', models.ForeignKey(orm[u'auth.permission'], null=False)) - )) - db.create_unique(m2m_table_name, ['newsdiffuser_id', 'permission_id']) - - # Adding model 'HaaretzArticle' - db.create_table(u'core_haaretzarticle', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('url', self.gf('django.db.models.fields.CharField')(max_length=200)), - ('title', self.gf('django.db.models.fields.CharField')(max_length=140)), - ('subtitle', self.gf('django.db.models.fields.CharField')(max_length=300, null=True, blank=True)), - ('text', self.gf('django.db.models.fields.TextField')()), - ('date', self.gf('django.db.models.fields.DateTimeField')()), - )) - db.send_create_signal(u'core', ['HaaretzArticle']) - - # Adding model 'HaaretzImage' - db.create_table(u'core_haaretzimage', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('article', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['core.HaaretzArticle'])), - ('origin_url', self.gf('django.db.models.fields.CharField')(max_length=200)), - ('image', self.gf('django.db.models.fields.files.ImageField')(max_length=100)), - ('caption', self.gf('django.db.models.fields.CharField')(max_length=140, null=True, blank=True)), - )) - db.send_create_signal(u'core', ['HaaretzImage']) - - - def backwards(self, orm): - # Deleting model 'NewsDiffUser' - db.delete_table(u'core_newsdiffuser') - - # Removing M2M table for field groups on 'NewsDiffUser' - db.delete_table(db.shorten_name(u'core_newsdiffuser_groups')) - - # Removing M2M table for field user_permissions on 'NewsDiffUser' - db.delete_table(db.shorten_name(u'core_newsdiffuser_user_permissions')) - - # Deleting model 'HaaretzArticle' - db.delete_table(u'core_haaretzarticle') - - # Deleting model 'HaaretzImage' - db.delete_table(u'core_haaretzimage') - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'core.haaretzarticle': { - 'Meta': {'object_name': 'HaaretzArticle'}, - 'date': ('django.db.models.fields.DateTimeField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'subtitle': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), - 'text': ('django.db.models.fields.TextField', [], {}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '140'}), - 'url': ('django.db.models.fields.CharField', [], {'max_length': '200'}) - }, - u'core.haaretzimage': { - 'Meta': {'object_name': 'HaaretzImage'}, - 'article': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.HaaretzArticle']"}), - 'caption': ('django.db.models.fields.CharField', [], {'max_length': '140', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'origin_url': ('django.db.models.fields.CharField', [], {'max_length': '200'}) - }, - u'core.newsdiffuser': { - 'Meta': {'object_name': 'NewsDiffUser'}, - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['core'] + operations = [ + migrations.CreateModel( + name='NewsDiffUser', + fields=[ + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True, serialize=False)), + ('password', models.CharField(verbose_name='password', max_length=128)), + ('last_login', models.DateTimeField(verbose_name='last login', blank=True, null=True)), + ('is_superuser', models.BooleanField(verbose_name='superuser status', help_text='Designates that this user has all permissions without explicitly assigning them.', default=False)), + ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', unique=True, verbose_name='username', validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.', 'invalid')], max_length=30)), + ('first_name', models.CharField(verbose_name='first name', blank=True, max_length=30)), + ('last_name', models.CharField(verbose_name='last name', blank=True, max_length=30)), + ('email', models.EmailField(verbose_name='email address', blank=True, max_length=254)), + ('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)), + ('date_joined', models.DateTimeField(verbose_name='date joined', default=django.utils.timezone.now)), + ('groups', models.ManyToManyField(related_query_name='user', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', to='auth.Group', verbose_name='groups', related_name='user_set')), + ('user_permissions', models.ManyToManyField(related_query_name='user', blank=True, help_text='Specific permissions for this user.', to='auth.Permission', verbose_name='user permissions', related_name='user_set')), + ], + options={ + 'verbose_name': 'user', + 'abstract': False, + 'verbose_name_plural': 'users', + }, + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + migrations.CreateModel( + name='HaaretzArticle', + fields=[ + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True, serialize=False)), + ('url', models.CharField(max_length=250)), + ('haaretz_id', models.CharField(unique=True, max_length=12, db_index=True)), + ('title', models.CharField(max_length=200)), + ('subtitle', models.CharField(blank=True, max_length=1000, null=True)), + ('author', models.CharField(max_length=120)), + ('text', models.TextField()), + ('date', models.DateTimeField()), + ('starred', models.BooleanField(default=False)), + ], + ), + migrations.CreateModel( + name='HaaretzImage', + fields=[ + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True, serialize=False)), + ('origin_url', models.CharField(unique=True, max_length=250)), + ('image', models.ImageField(upload_to='images/haaretz')), + ('caption', models.CharField(blank=True, max_length=140, null=True)), + ('article', models.ForeignKey(to='core.HaaretzArticle', related_name='images')), + ], + ), + migrations.CreateModel( + name='YnetArticle', + fields=[ + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True, serialize=False)), + ('url', models.CharField(max_length=250)), + ('ynet_id', models.CharField(unique=True, max_length=9, db_index=True)), + ('title', models.CharField(max_length=200)), + ('subtitle', models.CharField(blank=True, max_length=1000, null=True)), + ('author', models.CharField(max_length=60)), + ('text', models.TextField()), + ('date', models.DateTimeField()), + ], + ), + migrations.CreateModel( + name='YnetImage', + fields=[ + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True, serialize=False)), + ('origin_url', models.CharField(unique=True, max_length=250)), + ('image', models.ImageField(upload_to='images/ynet')), + ('caption', models.CharField(blank=True, max_length=140, null=True)), + ('article', models.ForeignKey(to='core.YnetArticle', related_name='images')), + ], + ), + ] diff --git a/newsdiff/core/migrations/0002_auto__add_index_haaretzarticle_url__add_unique_haaretzarticle_url.py b/newsdiff/core/migrations/0002_auto__add_index_haaretzarticle_url__add_unique_haaretzarticle_url.py deleted file mode 100644 index 6ae652d..0000000 --- a/newsdiff/core/migrations/0002_auto__add_index_haaretzarticle_url__add_unique_haaretzarticle_url.py +++ /dev/null @@ -1,82 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding index on 'HaaretzArticle', fields ['url'] - db.create_index(u'core_haaretzarticle', ['url']) - - # Adding unique constraint on 'HaaretzArticle', fields ['url'] - db.create_unique(u'core_haaretzarticle', ['url']) - - - def backwards(self, orm): - # Removing unique constraint on 'HaaretzArticle', fields ['url'] - db.delete_unique(u'core_haaretzarticle', ['url']) - - # Removing index on 'HaaretzArticle', fields ['url'] - db.delete_index(u'core_haaretzarticle', ['url']) - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'core.haaretzarticle': { - 'Meta': {'object_name': 'HaaretzArticle'}, - 'date': ('django.db.models.fields.DateTimeField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'subtitle': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), - 'text': ('django.db.models.fields.TextField', [], {}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '140'}), - 'url': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200', 'db_index': 'True'}) - }, - u'core.haaretzimage': { - 'Meta': {'object_name': 'HaaretzImage'}, - 'article': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.HaaretzArticle']"}), - 'caption': ('django.db.models.fields.CharField', [], {'max_length': '140', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'origin_url': ('django.db.models.fields.CharField', [], {'max_length': '200'}) - }, - u'core.newsdiffuser': { - 'Meta': {'object_name': 'NewsDiffUser'}, - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['core']
\ No newline at end of file diff --git a/newsdiff/core/migrations/0003_auto__add_field_haaretzarticle_haaretz_id__del_index_haaretzarticle_ur.py b/newsdiff/core/migrations/0003_auto__add_field_haaretzarticle_haaretz_id__del_index_haaretzarticle_ur.py deleted file mode 100644 index 019d11e..0000000 --- a/newsdiff/core/migrations/0003_auto__add_field_haaretzarticle_haaretz_id__del_index_haaretzarticle_ur.py +++ /dev/null @@ -1,91 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Removing unique constraint on 'HaaretzArticle', fields ['url'] - db.delete_unique(u'core_haaretzarticle', ['url']) - - # Adding field 'HaaretzArticle.haaretz_id' - db.add_column(u'core_haaretzarticle', 'haaretz_id', - self.gf('django.db.models.fields.CharField')(default=1.99999999, unique=True, max_length=12, db_index=True), - keep_default=False) - - # Removing index on 'HaaretzArticle', fields ['url'] - db.delete_index(u'core_haaretzarticle', ['url']) - - - def backwards(self, orm): - # Adding index on 'HaaretzArticle', fields ['url'] - db.create_index(u'core_haaretzarticle', ['url']) - - # Deleting field 'HaaretzArticle.haaretz_id' - db.delete_column(u'core_haaretzarticle', 'haaretz_id') - - # Adding unique constraint on 'HaaretzArticle', fields ['url'] - db.create_unique(u'core_haaretzarticle', ['url']) - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'core.haaretzarticle': { - 'Meta': {'object_name': 'HaaretzArticle'}, - 'date': ('django.db.models.fields.DateTimeField', [], {}), - 'haaretz_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '12', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'subtitle': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), - 'text': ('django.db.models.fields.TextField', [], {}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '140'}), - 'url': ('django.db.models.fields.CharField', [], {'max_length': '200'}) - }, - u'core.haaretzimage': { - 'Meta': {'object_name': 'HaaretzImage'}, - 'article': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.HaaretzArticle']"}), - 'caption': ('django.db.models.fields.CharField', [], {'max_length': '140', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'origin_url': ('django.db.models.fields.CharField', [], {'max_length': '200'}) - }, - u'core.newsdiffuser': { - 'Meta': {'object_name': 'NewsDiffUser'}, - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['core']
\ No newline at end of file diff --git a/newsdiff/core/migrations/0004_auto__add_unique_haaretzimage_origin_url.py b/newsdiff/core/migrations/0004_auto__add_unique_haaretzimage_origin_url.py deleted file mode 100644 index dad824a..0000000 --- a/newsdiff/core/migrations/0004_auto__add_unique_haaretzimage_origin_url.py +++ /dev/null @@ -1,77 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding unique constraint on 'HaaretzImage', fields ['origin_url'] - db.create_unique(u'core_haaretzimage', ['origin_url']) - - - def backwards(self, orm): - # Removing unique constraint on 'HaaretzImage', fields ['origin_url'] - db.delete_unique(u'core_haaretzimage', ['origin_url']) - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'core.haaretzarticle': { - 'Meta': {'object_name': 'HaaretzArticle'}, - 'date': ('django.db.models.fields.DateTimeField', [], {}), - 'haaretz_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '12', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'subtitle': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), - 'text': ('django.db.models.fields.TextField', [], {}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '140'}), - 'url': ('django.db.models.fields.CharField', [], {'max_length': '200'}) - }, - u'core.haaretzimage': { - 'Meta': {'object_name': 'HaaretzImage'}, - 'article': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'images'", 'to': u"orm['core.HaaretzArticle']"}), - 'caption': ('django.db.models.fields.CharField', [], {'max_length': '140', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'origin_url': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}) - }, - u'core.newsdiffuser': { - 'Meta': {'object_name': 'NewsDiffUser'}, - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['core']
\ No newline at end of file diff --git a/newsdiff/core/migrations/0005_auto__add_field_haaretzarticle_author__chg_field_haaretzarticle_subtit.py b/newsdiff/core/migrations/0005_auto__add_field_haaretzarticle_author__chg_field_haaretzarticle_subtit.py deleted file mode 100644 index fdb605c..0000000 --- a/newsdiff/core/migrations/0005_auto__add_field_haaretzarticle_author__chg_field_haaretzarticle_subtit.py +++ /dev/null @@ -1,86 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'HaaretzArticle.author' - db.add_column(u'core_haaretzarticle', 'author', - self.gf('django.db.models.fields.CharField')(default='(unknown)', max_length=30), - keep_default=False) - - - # Changing field 'HaaretzArticle.subtitle' - db.alter_column(u'core_haaretzarticle', 'subtitle', self.gf('django.db.models.fields.CharField')(max_length=500, null=True)) - - def backwards(self, orm): - # Deleting field 'HaaretzArticle.author' - db.delete_column(u'core_haaretzarticle', 'author') - - - # Changing field 'HaaretzArticle.subtitle' - db.alter_column(u'core_haaretzarticle', 'subtitle', self.gf('django.db.models.fields.CharField')(max_length=300, null=True)) - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'core.haaretzarticle': { - 'Meta': {'object_name': 'HaaretzArticle'}, - 'author': ('django.db.models.fields.CharField', [], {'max_length': '30'}), - 'date': ('django.db.models.fields.DateTimeField', [], {}), - 'haaretz_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '12', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'subtitle': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), - 'text': ('django.db.models.fields.TextField', [], {}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '140'}), - 'url': ('django.db.models.fields.CharField', [], {'max_length': '200'}) - }, - u'core.haaretzimage': { - 'Meta': {'object_name': 'HaaretzImage'}, - 'article': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'images'", 'to': u"orm['core.HaaretzArticle']"}), - 'caption': ('django.db.models.fields.CharField', [], {'max_length': '140', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'origin_url': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}) - }, - u'core.newsdiffuser': { - 'Meta': {'object_name': 'NewsDiffUser'}, - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['core']
\ No newline at end of file diff --git a/newsdiff/core/migrations/0006_auto__chg_field_haaretzimage_origin_url__chg_field_haaretzarticle_subt.py b/newsdiff/core/migrations/0006_auto__chg_field_haaretzimage_origin_url__chg_field_haaretzarticle_subt.py deleted file mode 100644 index de36ae0..0000000 --- a/newsdiff/core/migrations/0006_auto__chg_field_haaretzimage_origin_url__chg_field_haaretzarticle_subt.py +++ /dev/null @@ -1,102 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'HaaretzImage.origin_url' - db.alter_column(u'core_haaretzimage', 'origin_url', self.gf('django.db.models.fields.CharField')(unique=True, max_length=250)) - - # Changing field 'HaaretzArticle.subtitle' - db.alter_column(u'core_haaretzarticle', 'subtitle', self.gf('django.db.models.fields.CharField')(max_length=1000, null=True)) - - # Changing field 'HaaretzArticle.title' - db.alter_column(u'core_haaretzarticle', 'title', self.gf('django.db.models.fields.CharField')(max_length=200)) - - # Changing field 'HaaretzArticle.url' - db.alter_column(u'core_haaretzarticle', 'url', self.gf('django.db.models.fields.CharField')(max_length=250)) - - # Changing field 'HaaretzArticle.author' - db.alter_column(u'core_haaretzarticle', 'author', self.gf('django.db.models.fields.CharField')(max_length=60)) - - def backwards(self, orm): - - # Changing field 'HaaretzImage.origin_url' - db.alter_column(u'core_haaretzimage', 'origin_url', self.gf('django.db.models.fields.CharField')(max_length=200, unique=True)) - - # Changing field 'HaaretzArticle.subtitle' - db.alter_column(u'core_haaretzarticle', 'subtitle', self.gf('django.db.models.fields.CharField')(max_length=500, null=True)) - - # Changing field 'HaaretzArticle.title' - db.alter_column(u'core_haaretzarticle', 'title', self.gf('django.db.models.fields.CharField')(max_length=140)) - - # Changing field 'HaaretzArticle.url' - db.alter_column(u'core_haaretzarticle', 'url', self.gf('django.db.models.fields.CharField')(max_length=200)) - - # Changing field 'HaaretzArticle.author' - db.alter_column(u'core_haaretzarticle', 'author', self.gf('django.db.models.fields.CharField')(max_length=30)) - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'core.haaretzarticle': { - 'Meta': {'object_name': 'HaaretzArticle'}, - 'author': ('django.db.models.fields.CharField', [], {'max_length': '60'}), - 'date': ('django.db.models.fields.DateTimeField', [], {}), - 'haaretz_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '12', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'subtitle': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}), - 'text': ('django.db.models.fields.TextField', [], {}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'}), - 'url': ('django.db.models.fields.CharField', [], {'max_length': '250'}) - }, - u'core.haaretzimage': { - 'Meta': {'object_name': 'HaaretzImage'}, - 'article': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'images'", 'to': u"orm['core.HaaretzArticle']"}), - 'caption': ('django.db.models.fields.CharField', [], {'max_length': '140', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'origin_url': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '250'}) - }, - u'core.newsdiffuser': { - 'Meta': {'object_name': 'NewsDiffUser'}, - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['core']
\ No newline at end of file diff --git a/newsdiff/core/migrations/0007_auto__add_ynetarticle__add_ynetimage.py b/newsdiff/core/migrations/0007_auto__add_ynetarticle__add_ynetimage.py deleted file mode 100644 index c04d291..0000000 --- a/newsdiff/core/migrations/0007_auto__add_ynetarticle__add_ynetimage.py +++ /dev/null @@ -1,120 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding model 'YnetArticle' - db.create_table(u'core_ynetarticle', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('url', self.gf('django.db.models.fields.CharField')(max_length=250)), - ('ynet_id', self.gf('django.db.models.fields.CharField')(unique=True, max_length=9, db_index=True)), - ('title', self.gf('django.db.models.fields.CharField')(max_length=200)), - ('subtitle', self.gf('django.db.models.fields.CharField')(max_length=1000, null=True, blank=True)), - ('author', self.gf('django.db.models.fields.CharField')(max_length=60)), - ('text', self.gf('django.db.models.fields.TextField')()), - ('date', self.gf('django.db.models.fields.DateTimeField')()), - )) - db.send_create_signal(u'core', ['YnetArticle']) - - # Adding model 'YnetImage' - db.create_table(u'core_ynetimage', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('article', self.gf('django.db.models.fields.related.ForeignKey')(related_name='images', to=orm['core.YnetArticle'])), - ('origin_url', self.gf('django.db.models.fields.CharField')(unique=True, max_length=250)), - ('image', self.gf('django.db.models.fields.files.ImageField')(max_length=100)), - ('caption', self.gf('django.db.models.fields.CharField')(max_length=140, null=True, blank=True)), - )) - db.send_create_signal(u'core', ['YnetImage']) - - - def backwards(self, orm): - # Deleting model 'YnetArticle' - db.delete_table(u'core_ynetarticle') - - # Deleting model 'YnetImage' - db.delete_table(u'core_ynetimage') - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'core.haaretzarticle': { - 'Meta': {'object_name': 'HaaretzArticle'}, - 'author': ('django.db.models.fields.CharField', [], {'max_length': '60'}), - 'date': ('django.db.models.fields.DateTimeField', [], {}), - 'haaretz_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '12', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'subtitle': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}), - 'text': ('django.db.models.fields.TextField', [], {}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'}), - 'url': ('django.db.models.fields.CharField', [], {'max_length': '250'}) - }, - u'core.haaretzimage': { - 'Meta': {'object_name': 'HaaretzImage'}, - 'article': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'images'", 'to': u"orm['core.HaaretzArticle']"}), - 'caption': ('django.db.models.fields.CharField', [], {'max_length': '140', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'origin_url': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '250'}) - }, - u'core.newsdiffuser': { - 'Meta': {'object_name': 'NewsDiffUser'}, - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'core.ynetarticle': { - 'Meta': {'object_name': 'YnetArticle'}, - 'author': ('django.db.models.fields.CharField', [], {'max_length': '60'}), - 'date': ('django.db.models.fields.DateTimeField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'subtitle': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}), - 'text': ('django.db.models.fields.TextField', [], {}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'}), - 'url': ('django.db.models.fields.CharField', [], {'max_length': '250'}), - 'ynet_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '9', 'db_index': 'True'}) - }, - u'core.ynetimage': { - 'Meta': {'object_name': 'YnetImage'}, - 'article': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'images'", 'to': u"orm['core.YnetArticle']"}), - 'caption': ('django.db.models.fields.CharField', [], {'max_length': '140', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'origin_url': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '250'}) - } - } - - complete_apps = ['core']
\ No newline at end of file diff --git a/newsdiff/core/migrations/0008_auto__chg_field_haaretzarticle_author.py b/newsdiff/core/migrations/0008_auto__chg_field_haaretzarticle_author.py deleted file mode 100644 index a31f8a0..0000000 --- a/newsdiff/core/migrations/0008_auto__chg_field_haaretzarticle_author.py +++ /dev/null @@ -1,97 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'HaaretzArticle.author' - db.alter_column(u'core_haaretzarticle', 'author', self.gf('django.db.models.fields.CharField')(max_length=120)) - - def backwards(self, orm): - - # Changing field 'HaaretzArticle.author' - db.alter_column(u'core_haaretzarticle', 'author', self.gf('django.db.models.fields.CharField')(max_length=60)) - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'core.haaretzarticle': { - 'Meta': {'object_name': 'HaaretzArticle'}, - 'author': ('django.db.models.fields.CharField', [], {'max_length': '120'}), - 'date': ('django.db.models.fields.DateTimeField', [], {}), - 'haaretz_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '12', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'subtitle': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}), - 'text': ('django.db.models.fields.TextField', [], {}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'}), - 'url': ('django.db.models.fields.CharField', [], {'max_length': '250'}) - }, - u'core.haaretzimage': { - 'Meta': {'object_name': 'HaaretzImage'}, - 'article': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'images'", 'to': u"orm['core.HaaretzArticle']"}), - 'caption': ('django.db.models.fields.CharField', [], {'max_length': '140', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'origin_url': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '250'}) - }, - u'core.newsdiffuser': { - 'Meta': {'object_name': 'NewsDiffUser'}, - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'core.ynetarticle': { - 'Meta': {'object_name': 'YnetArticle'}, - 'author': ('django.db.models.fields.CharField', [], {'max_length': '60'}), - 'date': ('django.db.models.fields.DateTimeField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'subtitle': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}), - 'text': ('django.db.models.fields.TextField', [], {}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'}), - 'url': ('django.db.models.fields.CharField', [], {'max_length': '250'}), - 'ynet_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '9', 'db_index': 'True'}) - }, - u'core.ynetimage': { - 'Meta': {'object_name': 'YnetImage'}, - 'article': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'images'", 'to': u"orm['core.YnetArticle']"}), - 'caption': ('django.db.models.fields.CharField', [], {'max_length': '140', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'origin_url': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '250'}) - } - } - - complete_apps = ['core']
\ No newline at end of file diff --git a/newsdiff/core/migrations/0009_auto__add_field_haaretzarticle_starred.py b/newsdiff/core/migrations/0009_auto__add_field_haaretzarticle_starred.py deleted file mode 100644 index d8b41f8..0000000 --- a/newsdiff/core/migrations/0009_auto__add_field_haaretzarticle_starred.py +++ /dev/null @@ -1,100 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'HaaretzArticle.starred' - db.add_column(u'core_haaretzarticle', 'starred', - self.gf('django.db.models.fields.BooleanField')(default=False), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'HaaretzArticle.starred' - db.delete_column(u'core_haaretzarticle', 'starred') - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'core.haaretzarticle': { - 'Meta': {'object_name': 'HaaretzArticle'}, - 'author': ('django.db.models.fields.CharField', [], {'max_length': '120'}), - 'date': ('django.db.models.fields.DateTimeField', [], {}), - 'haaretz_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '12', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'starred': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'subtitle': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}), - 'text': ('django.db.models.fields.TextField', [], {}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'}), - 'url': ('django.db.models.fields.CharField', [], {'max_length': '250'}) - }, - u'core.haaretzimage': { - 'Meta': {'object_name': 'HaaretzImage'}, - 'article': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'images'", 'to': u"orm['core.HaaretzArticle']"}), - 'caption': ('django.db.models.fields.CharField', [], {'max_length': '140', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'origin_url': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '250'}) - }, - u'core.newsdiffuser': { - 'Meta': {'object_name': 'NewsDiffUser'}, - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'core.ynetarticle': { - 'Meta': {'object_name': 'YnetArticle'}, - 'author': ('django.db.models.fields.CharField', [], {'max_length': '60'}), - 'date': ('django.db.models.fields.DateTimeField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'subtitle': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}), - 'text': ('django.db.models.fields.TextField', [], {}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'}), - 'url': ('django.db.models.fields.CharField', [], {'max_length': '250'}), - 'ynet_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '9', 'db_index': 'True'}) - }, - u'core.ynetimage': { - 'Meta': {'object_name': 'YnetImage'}, - 'article': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'images'", 'to': u"orm['core.YnetArticle']"}), - 'caption': ('django.db.models.fields.CharField', [], {'max_length': '140', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'origin_url': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '250'}) - } - } - - complete_apps = ['core']
\ No newline at end of file diff --git a/newsdiff/docs/migrations/0001_initial.py b/newsdiff/docs/migrations/0001_initial.py index 3fa5fef..7418e67 100644 --- a/newsdiff/docs/migrations/0001_initial.py +++ b/newsdiff/docs/migrations/0001_initial.py @@ -1,38 +1,23 @@ # -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models +from __future__ import unicode_literals +from django.db import models, migrations -class Migration(SchemaMigration): - def forwards(self, orm): - # Adding model 'Document' - db.create_table(u'docs_document', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('name', self.gf('django.db.models.fields.CharField')(default='(untitled)', max_length=100)), - ('url', self.gf('django.db.models.fields.URLField')(max_length=200)), - ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), - ('document', self.gf('django.db.models.fields.files.FileField')(max_length=100)), - )) - db.send_create_signal(u'docs', ['Document']) +class Migration(migrations.Migration): + dependencies = [ + ] - def backwards(self, orm): - # Deleting model 'Document' - db.delete_table(u'docs_document') - - - models = { - u'docs.document': { - 'Meta': {'object_name': 'Document'}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'document': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'default': "'(untitled)'", 'max_length': '100'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '200'}) - } - } - - complete_apps = ['docs']
\ No newline at end of file + operations = [ + migrations.CreateModel( + name='Document', + fields=[ + ('id', models.AutoField(verbose_name='ID', auto_created=True, primary_key=True, serialize=False)), + ('name', models.CharField(max_length=100, default='(untitled)')), + ('url', models.URLField()), + ('created', models.DateTimeField(auto_now_add=True)), + ('document', models.FileField(upload_to='documents')), + ], + ), + ] diff --git a/newsdiff/rain/migrations/0001_initial.py b/newsdiff/rain/migrations/0001_initial.py index e60bdb0..d39a8bb 100644 --- a/newsdiff/rain/migrations/0001_initial.py +++ b/newsdiff/rain/migrations/0001_initial.py @@ -1,34 +1,21 @@ # -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models +from __future__ import unicode_literals +from django.db import models, migrations -class Migration(SchemaMigration): - def forwards(self, orm): - # Adding model 'RainRadarImage' - db.create_table(u'rain_rainradarimage', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), - ('image', self.gf('django.db.models.fields.files.ImageField')(max_length=100)), - )) - db.send_create_signal(u'rain', ['RainRadarImage']) +class Migration(migrations.Migration): + dependencies = [ + ] - def backwards(self, orm): - # Deleting model 'RainRadarImage' - db.delete_table(u'rain_rainradarimage') - - - models = { - u'rain.rainradarimage': { - 'Meta': {'object_name': 'RainRadarImage'}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}) - } - } - - complete_apps = ['rain']
\ No newline at end of file + operations = [ + migrations.CreateModel( + name='RainRadarImage', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('created', models.DateTimeField(auto_now_add=True)), + ('image', models.ImageField(upload_to='rain/%Y/%m/%d')), + ], + ), + ] diff --git a/newsdiff/settings/base.py b/newsdiff/settings/base.py index e664a5b..a5cf241 100644 --- a/newsdiff/settings/base.py +++ b/newsdiff/settings/base.py @@ -1,8 +1,7 @@ from datetime import timedelta -from unipath import FSPath as Path +from pathlib import Path - -PROJECT_DIR = Path(__file__).absolute().ancestor(2) +PROJECT_DIR = Path(__file__).resolve().parents[1] DEBUG = False TEMPLATE_DEBUG = DEBUG @@ -28,7 +27,7 @@ STATIC_ROOT = '' STATIC_URL = '/static/' STATICFILES_DIRS = ( - PROJECT_DIR.child('static'), + str(PROJECT_DIR / 'static'), ) STATICFILES_FINDERS = ( @@ -70,7 +69,7 @@ ROOT_URLCONF = 'newsdiff.urls' WSGI_APPLICATION = 'newsdiff.wsgi.application' TEMPLATE_DIRS = ( - PROJECT_DIR.child('templates'), + str(PROJECT_DIR / 'templates'), ) INSTALLED_APPS = ( @@ -83,7 +82,6 @@ INSTALLED_APPS = ( 'django.contrib.admin', 'gunicorn', - 'south', 'storages', 'celery', 'reversion', @@ -124,8 +122,6 @@ LOGGING = { } } -TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' - CELERY_ACCEPT_CONTENT = ['json'] CELERY_TASK_SERIALIZER = 'json' CELERYBEAT_SCHEDULE = { diff --git a/newsdiff/settings/local.py b/newsdiff/settings/local.py index cf76879..bf4672c 100644 --- a/newsdiff/settings/local.py +++ b/newsdiff/settings/local.py @@ -17,7 +17,7 @@ DATABASES = { } -MEDIA_ROOT = PROJECT_DIR.child('media') +MEDIA_ROOT = str(PROJECT_DIR / 'media') MEDIA_URL = '/media/' EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' |