Merge pull request #20 from dstegelman/feature/django_17

Django 1.7 Official Support

.gitignore

@@ -27,3 +27,4 @@ pip-log.txt
 .mr.developer.cfg
 
 .DS_Store
+*.sqlite

.travis.yml

@@ -7,10 +7,12 @@ env:
   - DJANGO_VERSION=Django==1.4.2
   - DJANGO_VERSION=Django==1.5
   - DJANGO_VERSION=Django==1.6
+  - DJANGO_VERSION=Django==1.7
 
 # command to install dependencies
 install:
-  - pip install $DJANGO_VERSION south factory_boy mock
+  - pip install $DJANGO_VERSION
+  - pip install -r test-requirements.txt
 
 # command to run tests
 

demo/demo/settings.py

@@ -145,7 +145,6 @@
     'django.contrib.staticfiles',
     'django.contrib.admin',
 
-    'south',
     'downtime',
 )
 

demo/requirements.txt

@@ -1,2 +1 @@
-django==1.6.1
-south
+django==1.7

downtime/migrations/0001_initial.py

@@ -1,36 +1,25 @@
 # -*- coding: utf-8 -*-
-import 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 'Period'
-        db.create_table('downtime_period', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('start_time', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
-            ('end_time', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
-            ('enabled', self.gf('django.db.models.fields.BooleanField')(default=False)),
-        ))
-        db.send_create_signal('downtime', ['Period'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'Period'
-        db.delete_table('downtime_period')
-
-
-    models = {
-        'downtime.period': {
-            'Meta': {'object_name': 'Period'},
-            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'end_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'start_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['downtime']
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Period',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('start_time', models.DateTimeField(null=True, blank=True)),
+                ('end_time', models.DateTimeField(null=True, blank=True)),
+                ('enabled', models.BooleanField(default=False)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]

downtime/south_migrations/0001_initial.py

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+import 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 'Period'
+        db.create_table('downtime_period', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('start_time', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
+            ('end_time', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
+            ('enabled', self.gf('django.db.models.fields.BooleanField')(default=False)),
+        ))
+        db.send_create_signal('downtime', ['Period'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'Period'
+        db.delete_table('downtime_period')
+
+
+    models = {
+        'downtime.period': {
+            'Meta': {'object_name': 'Period'},
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'end_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'start_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['downtime']