From 2574cfad9d390b0383398e261e53beeb1ffb5c43 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 18 Sep 2014 10:43:41 +0100
Subject: [PATCH 1/4] Added Django 1.7 support into project template
---
.../core/migrations/0001_initial.py | 97 +++----------
.../core/migrations/0002_create_homepage.py | 135 +++++-------------
wagtail/project_template/requirements.txt | 3 +-
3 files changed, 51 insertions(+), 184 deletions(-)
diff --git a/wagtail/project_template/core/migrations/0001_initial.py b/wagtail/project_template/core/migrations/0001_initial.py
index d750170b0c..9bf12542dd 100644
--- a/wagtail/project_template/core/migrations/0001_initial.py
+++ b/wagtail/project_template/core/migrations/0001_initial.py
@@ -1,87 +1,24 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
+from django.db import models, migrations
-class Migration(SchemaMigration):
+class Migration(migrations.Migration):
- def forwards(self, orm):
- # Adding model 'HomePage'
- db.create_table('core_homepage', (
- ('page_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['wagtailcore.Page'], unique=True, primary_key=True)),
- ))
- db.send_create_signal('core', ['HomePage'])
+ dependencies = [
+ ('wagtailcore', '0002_initial_data'),
+ ]
-
- def backwards(self, orm):
- # Deleting model 'HomePage'
- db.delete_table('core_homepage')
-
- models = {
- 'auth.group': {
- 'Meta': {'object_name': 'Group'},
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
- },
- 'auth.permission': {
- 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
- },
- 'auth.user': {
- 'Meta': {'object_name': 'User'},
- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}),
- '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': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}),
- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
- },
- 'contenttypes.contenttype': {
- 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
- },
- 'core.homepage': {
- 'Meta': {'object_name': 'HomePage', '_ormbases': ['wagtailcore.Page']},
- 'page_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['wagtailcore.Page']", 'unique': 'True', 'primary_key': 'True'})
- },
- 'wagtailcore.page': {
- 'Meta': {'object_name': 'Page'},
- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': "orm['contenttypes.ContentType']"}),
- 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
- 'expire_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
- 'expired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
- 'go_live_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
- 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
- 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
- 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': "orm['auth.User']"}),
- 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
- 'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
- 'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
- 'show_in_menus': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
- 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}),
- 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
- 'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
- }
- }
-
- complete_apps = ['core']
+ operations = [
+ migrations.CreateModel(
+ name='HomePage',
+ fields=[
+ ('page_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
+ ],
+ options={
+ 'abstract': False,
+ },
+ bases=('wagtailcore.page',),
+ ),
+ ]
diff --git a/wagtail/project_template/core/migrations/0002_create_homepage.py b/wagtail/project_template/core/migrations/0002_create_homepage.py
index 7d57af66ea..c83440b4d9 100644
--- a/wagtail/project_template/core/migrations/0002_create_homepage.py
+++ b/wagtail/project_template/core/migrations/0002_create_homepage.py
@@ -1,114 +1,45 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models, connection
-from django.db.transaction import set_autocommit
+from django.db import models, migrations
-class Migration(DataMigration):
+def create_homepage(apps, schema_editor):
+ # Get models
+ ContentType = apps.get_model('contenttypes.ContentType')
+ Page = apps.get_model('wagtailcore.Page')
+ Site = apps.get_model('wagtailcore.Site')
+ HomePage = apps.get_model('core.HomePage')
- depends_on = (
- ('wagtailcore', '0002_initial_data'),
+ # Delete the default homepage
+ Page.objects.get(id=2).delete()
+
+ # Create content type for homepage model
+ homepage_content_type, created = ContentType.objects.get_or_create(
+ model='homepage', app_label='core', defaults={'name': 'Homepage'})
+
+ # Create a new homepage
+ homepage = HomePage.objects.create(
+ title="Homepage",
+ slug='home',
+ content_type=homepage_content_type,
+ path='00010001',
+ depth=2,
+ numchild=0,
+ url_path='/home/',
)
- def forwards(self, orm):
- if connection.vendor == 'sqlite':
- set_autocommit(True)
+ # Create a site with the new homepage set as the root
+ Site.objects.create(
+ hostname='localhost', root_page=homepage, is_default_site=True)
- orm['wagtailcore.Page'].objects.get(id=2).delete()
- homepage_content_type, created = orm['contenttypes.contenttype'].objects.get_or_create(
- model='homepage', app_label='core', defaults={'name': 'Homepage'})
+class Migration(migrations.Migration):
- homepage = orm['core.HomePage'].objects.create(
- title="Homepage",
- slug='home',
- content_type=homepage_content_type,
- path='00010001',
- depth=2,
- numchild=0,
- url_path='/home/',
- )
+ dependencies = [
+ ('core', '0001_initial'),
+ ]
- orm['wagtailcore.site'].objects.create(
- hostname='localhost', root_page=homepage, is_default_site=True)
-
- def backwards(self, orm):
- pass
-
- models = {
- 'auth.group': {
- 'Meta': {'object_name': 'Group'},
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
- },
- 'auth.permission': {
- 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
- },
- 'auth.user': {
- 'Meta': {'object_name': 'User'},
- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}),
- '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': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}),
- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
- },
- 'contenttypes.contenttype': {
- 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
- },
- 'core.homepage': {
- 'Meta': {'object_name': 'HomePage', '_ormbases': ['wagtailcore.Page']},
- 'page_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['wagtailcore.Page']", 'unique': 'True', 'primary_key': 'True'})
- },
- 'wagtailcore.page': {
- 'Meta': {'object_name': 'Page'},
- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': "orm['contenttypes.ContentType']"}),
- 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
- 'expire_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
- 'expired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
- 'go_live_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
- 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
- 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
- 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': "orm['auth.User']"}),
- 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
- 'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
- 'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
- 'show_in_menus': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
- 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}),
- 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
- 'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
- },
- 'wagtailcore.site': {
- 'Meta': {'unique_together': "(('hostname', 'port'),)", 'object_name': 'Site'},
- 'hostname': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'is_default_site': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
- 'port': ('django.db.models.fields.IntegerField', [], {'default': '80'}),
- 'root_page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites_rooted_here'", 'to': "orm['wagtailcore.Page']"})
- }
- }
-
- complete_apps = ['core']
- symmetrical = True
+ operations = [
+ migrations.RunPython(create_homepage),
+ ]
diff --git a/wagtail/project_template/requirements.txt b/wagtail/project_template/requirements.txt
index 6cecb31e2f..d75817cf8d 100644
--- a/wagtail/project_template/requirements.txt
+++ b/wagtail/project_template/requirements.txt
@@ -1,6 +1,5 @@
# Minimal requirements
-Django>=1.6.2,<1.7
-South==1.0.0
+Django>=1.7,<1.8
wagtail==0.6
# Recommended components (require additional setup):
From f56a234e2883a0d25069729316acde61b73e5f51 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 18 Sep 2014 10:56:47 +0100
Subject: [PATCH 2/4] Removed south from base settings in project template
---
wagtail/project_template/project_name/settings/base.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/wagtail/project_template/project_name/settings/base.py b/wagtail/project_template/project_name/settings/base.py
index b0ad25c3b2..3719211352 100644
--- a/wagtail/project_template/project_name/settings/base.py
+++ b/wagtail/project_template/project_name/settings/base.py
@@ -38,7 +38,6 @@ INSTALLED_APPS = (
'django.contrib.messages',
'django.contrib.staticfiles',
- 'south',
'compressor',
'taggit',
'modelcluster',
From 31b8a14b6244afd9b84f889ef0386def8ec5ebd6 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 18 Sep 2014 10:57:10 +0100
Subject: [PATCH 3/4] Docs update for project template django 1.7 support
---
docs/getting_started/installation.rst | 1 -
1 file changed, 1 deletion(-)
diff --git a/docs/getting_started/installation.rst b/docs/getting_started/installation.rst
index 294144bcb4..ed246f8af3 100644
--- a/docs/getting_started/installation.rst
+++ b/docs/getting_started/installation.rst
@@ -64,7 +64,6 @@ You will now be able to run the following command to set up an initial file stru
cd myprojectname
pip install -r requirements.txt
- python manage.py syncdb
python manage.py migrate
python manage.py runserver
From 078d4fadde6f4fa2c9ec78793460fe232a3f7e16 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 18 Sep 2014 10:57:33 +0100
Subject: [PATCH 4/4] No need to run syncdb in project template vagrantfile
anymore
---
wagtail/project_template/vagrant/provision.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/wagtail/project_template/vagrant/provision.sh b/wagtail/project_template/vagrant/provision.sh
index 03d28a89b5..16842fa687 100755
--- a/wagtail/project_template/vagrant/provision.sh
+++ b/wagtail/project_template/vagrant/provision.sh
@@ -22,8 +22,7 @@ chmod a+x $PROJECT_DIR/manage.py
# Run syncdb/migrate/update_index
-su - vagrant -c "$PYTHON $PROJECT_DIR/manage.py syncdb --noinput && \
- $PYTHON $PROJECT_DIR/manage.py migrate --noinput && \
+su - vagrant -c "$PYTHON $PROJECT_DIR/manage.py migrate --noinput && \
$PYTHON $PROJECT_DIR/manage.py update_index"