fmartingr
/
fmartingr.com-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgraded 

Updated python requirements, refactored migrations from south to django
1.7
This commit is contained in:
Felipe Martín 2015-03-19 19:14:23 +01:00
parent 8a8aea6877
commit 3b1b2d6135
5 changed files with 88 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
fmartingrcom/apps/blog/migrations/0001_initial.py
View File

@ -1,108 +1,51 @@
# -*- 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
from django.conf import settings
import ckeditor.fields
class Migration(SchemaMigration):
class Migration(migrations.Migration):
def forwards(self, orm):
# Adding model 'Entry'
db.create_table(u'blog_entry', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('title', self.gf('django.db.models.fields.CharField')(max_length=128)),
('date', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime(2014, 9, 4, 0, 0))),
('content', self.gf('ckeditor.fields.RichTextField')()),
('slug', self.gf('django.db.models.fields.SlugField')(max_length=128)),
('draft', self.gf('django.db.models.fields.BooleanField')(default=True)),
('author', self.gf('django.db.models.fields.related.ForeignKey')(related_name='author', to=orm['auth.User'])),
))
db.send_create_signal('blog', ['Entry'])
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
# Adding M2M table for field tags on 'Entry'
m2m_table_name = db.shorten_name(u'blog_entry_tags')
db.create_table(m2m_table_name, (
('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
('entry', models.ForeignKey(orm['blog.entry'], null=False)),
('tag', models.ForeignKey(orm['blog.tag'], null=False))
))
db.create_unique(m2m_table_name, ['entry_id', 'tag_id'])
# Adding model 'Tag'
db.create_table(u'blog_tag', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('name', self.gf('django.db.models.fields.CharField')(max_length=128)),
('color', self.gf('django.db.models.fields.CharField')(max_length=6, blank=True)),
))
db.send_create_signal('blog', ['Tag'])
def backwards(self, orm):
# Deleting model 'Entry'
db.delete_table(u'blog_entry')
# Removing M2M table for field tags on 'Entry'
db.delete_table(db.shorten_name(u'blog_entry_tags'))
# Deleting model 'Tag'
db.delete_table(u'blog_tag')
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'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', [], {'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'})
},
'blog.entry': {
'Meta': {'ordering': "['-date']", 'object_name': 'Entry'},
'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'author'", 'to': u"orm['auth.User']"}),
'content': ('ckeditor.fields.RichTextField', [], {}),
'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2014, 9, 4, 0, 0)'}),
'draft': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'slug': ('django.db.models.fields.SlugField', [], {'max_length': '128'}),
'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['blog.Tag']", 'null': 'True', 'blank': 'True'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '128'})
},
'blog.tag': {
'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
'color': ('django.db.models.fields.CharField', [], {'max_length': '6', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
},
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'})
}
}
complete_apps = ['blog']
operations = [
migrations.CreateModel(
name='Entry',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('title', models.CharField(max_length=128)),
('date', models.DateTimeField()),
('content', ckeditor.fields.RichTextField()),
('slug', models.SlugField(max_length=128)),
('draft', models.BooleanField(default=True)),
('author', models.ForeignKey(related_name='author', editable=False, to=settings.AUTH_USER_MODEL)),
],
options={
'ordering': ['-date'],
'verbose_name_plural': 'Entries',
},
bases=(models.Model,),
),
migrations.CreateModel(
name='Tag',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('name', models.CharField(max_length=128)),
('color', models.CharField(max_length=6, blank=True)),
],
options={
'ordering': ['name'],
},
bases=(models.Model,),
),
migrations.AddField(
model_name='entry',
name='tags',
field=models.ManyToManyField(to='blog.Tag', null=True, blank=True),
preserve_default=True,
),
]

4
fmartingrcom/apps/blog/models.py
View File

@ -12,7 +12,7 @@ from django.utils.translation import activate
#
class Entry(models.Model):
title = models.CharField(max_length=128)
date = models.DateTimeField(default=datetime.now(tz=utc))
date = models.DateTimeField()
content = RichTextField()
slug = models.SlugField(max_length=128)
draft = models.BooleanField(default=True)
@ -67,5 +67,3 @@ class Tag(models.Model):
class Meta:
app_label = 'blog'
ordering = ['name']

80
fmartingrcom/apps/config/migrations/0001_initial.py
View File

@ -1,54 +1,36 @@
# -*- 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):
class Migration(migrations.Migration):
def forwards(self, orm):
# Adding model 'SiteConfiguration'
db.create_table(u'config_siteconfiguration', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('base_url', self.gf('django.db.models.fields.CharField')(max_length=256, null=True, blank=True)),
('google_analytics', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
('google_analytics_domain', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
('enable_comments', self.gf('django.db.models.fields.BooleanField')(default=True)),
('disqus_shortname', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
('show_share_buttons', self.gf('django.db.models.fields.BooleanField')(default=True)),
('twitter_username', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
('readmore_tag', self.gf('django.db.models.fields.CharField')(default='<!--readmore-->', max_length=128)),
('entries_per_page', self.gf('django.db.models.fields.IntegerField')(default=4)),
('rss_items', self.gf('django.db.models.fields.IntegerField')(default=10)),
('rss_blog_title', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
('rss_blog_description', self.gf('django.db.models.fields.CharField')(max_length=256, null=True, blank=True)),
))
db.send_create_signal(u'config', ['SiteConfiguration'])
dependencies = [
]
def backwards(self, orm):
# Deleting model 'SiteConfiguration'
db.delete_table(u'config_siteconfiguration')
models = {
u'config.siteconfiguration': {
'Meta': {'object_name': 'SiteConfiguration'},
'base_url': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),
'disqus_shortname': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
'enable_comments': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'entries_per_page': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
'google_analytics': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
'google_analytics_domain': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'readmore_tag': ('django.db.models.fields.CharField', [], {'default': "'<!--readmore-->'", 'max_length': '128'}),
'rss_blog_description': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}),
'rss_blog_title': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
'rss_items': ('django.db.models.fields.IntegerField', [], {'default': '10'}),
'show_share_buttons': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'twitter_username': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'})
}
}
complete_apps = ['config']
operations = [
migrations.CreateModel(
name='SiteConfiguration',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('base_url', models.CharField(max_length=256, null=True, blank=True)),
('google_analytics', models.CharField(max_length=128, null=True, blank=True)),
('google_analytics_domain', models.CharField(max_length=128, null=True, blank=True)),
('enable_comments', models.BooleanField(default=True)),
('disqus_shortname', models.CharField(max_length=128, null=True, blank=True)),
('show_share_buttons', models.BooleanField(default=True)),
('twitter_username', models.CharField(max_length=128, null=True, blank=True)),
('readmore_tag', models.CharField(default=b'<!--readmore-->', max_length=128)),
('entries_per_page', models.IntegerField(default=4)),
('rss_items', models.IntegerField(default=10)),
('rss_blog_title', models.CharField(max_length=128, null=True, blank=True)),
('rss_blog_description', models.CharField(max_length=256, null=True, blank=True)),
],
options={
'verbose_name': 'Site Configuration',
'verbose_name_plural': 'Site Configuration',
},
bases=(models.Model,),
),
]

9
fmartingrcom/settings/base.py
View File

@ -40,7 +40,6 @@ INSTALLED_APPS = (
'django.contrib.messages',
'django.contrib.staticfiles',
'compressor',
'reversion',
@ -54,8 +53,6 @@ INSTALLED_APPS = (
'django_jinja',
'ckeditor',
'south',
)
@ -95,7 +92,7 @@ LANGUAGE_CODE = 'en-us'
TIME_ZONE = 'UTC'
USE_I18N = True
USE_I18N = False
USE_L10N = True
@ -169,8 +166,8 @@ TEMPLATE_LOADERS = (
TEMPLATE_DIRS = (
'{}/themes/v1/templates/'.format(BASE_DIR),
)
JINJA2_EXTENSIONS = [
from django_jinja.base import DEFAULT_EXTENSIONS
JINJA2_EXTENSIONS = DEFAULT_EXTENSIONS + [
'compressor.contrib.jinja2ext.CompressorExtension',
]

16
requirements.txt
View File

@ -1,17 +1,15 @@
Django==1.6.6
Django==1.7.7
Jinja2==2.7.3
django-jinja==1.0.4
django-jinja==1.3.1
#psycopg2==2.5.4
South==1.0
dj-database-url==0.3.0
django-suit==0.2.9
django-reversion==1.8.2
django-solo==1.0.5
django-ckeditor-updated==4.4.0
django-suit==0.2.12
django-reversion==1.8.5
django-solo==1.1.0
django-ckeditor-updated==4.4.4
pytz==2014.7
pytz==2014.10
django-compressor==1.4