Revert "Rebase migrations"

SatNOGS/base/migrations/0002_auto_20141015_0800.py

@@ -8,33 +8,27 @@ from django.conf import settings
 class Migration(migrations.Migration):
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('base', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='data',
-            name='ground_station',
-            field=models.ForeignKey(to='base.Station', null=True),
-            preserve_default=True,
-        ),
-        migrations.AddField(
-            model_name='data',
-            name='observation',
-            field=models.ForeignKey(to='base.Observation', null=True),
+            model_name='station',
+            name='owner',
+            field=models.ForeignKey(to=settings.AUTH_USER_MODEL),
             preserve_default=True,
         ),
         migrations.AddField(
             model_name='observation',
             name='author',
-            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, null=True),
+            field=models.ForeignKey(to=settings.AUTH_USER_MODEL),
             preserve_default=True,
         ),
         migrations.AddField(
             model_name='observation',
             name='satellite',
-            field=models.ForeignKey(to='base.Satellite', null=True),
+            field=models.ForeignKey(to='base.Satellite'),
             preserve_default=True,
         ),
         migrations.AddField(
@@ -44,26 +38,15 @@ class Migration(migrations.Migration):
             preserve_default=True,
         ),
         migrations.AddField(
-            model_name='satellite',
-            name='tle',
-            field=models.CharField(max_length=500, null=True),
+            model_name='data',
+            name='ground_station',
+            field=models.ForeignKey(to='base.Station'),
             preserve_default=True,
         ),
         migrations.AddField(
-            model_name='satellite',
-            name='updated',
-            field=models.DateTimeField(auto_now_add=True, null=True),
+            model_name='data',
+            name='observation',
+            field=models.ForeignKey(to='base.Observation'),
             preserve_default=True,
         ),
-        migrations.AddField(
-            model_name='station',
-            name='owner',
-            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, null=True),
-            preserve_default=True,
-        ),
-        migrations.AlterField(
-            model_name='transponder',
-            name='alive',
-            field=models.BooleanField(default=True),
-        ),
     ]

SatNOGS/base/migrations/0003_auto_20141016_0506.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0002_auto_20141015_0800'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='transponder',
+            name='alive',
+            field=models.BooleanField(default=True),
+        ),
+    ]

SatNOGS/base/migrations/0004_satellite_tle.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0003_auto_20141016_0506'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='satellite',
+            name='tle',
+            field=models.CharField(max_length=500, null=True),
+            preserve_default=True,
+        ),
+    ]

SatNOGS/base/migrations/0005_satellite_updated.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import datetime
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0004_satellite_tle'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='satellite',
+            name='updated',
+            field=models.DateTimeField(default=datetime.date(2014, 10, 24), auto_now_add=True),
+            preserve_default=False,
+        ),
+    ]

SatNOGS/base/models.py

@@ -25,7 +25,7 @@ class Antenna(models.Model):
 
 class Station(models.Model):
     """Model for SatNOGS ground stations."""
-    owner = models.ForeignKey(User, null=True)
+    owner = models.ForeignKey(User)
     name = models.CharField(max_length=45)
     image = models.ImageField(upload_to='ground_stations')
     alt = models.PositiveIntegerField()
@@ -57,7 +57,7 @@ class Satellite(models.Model):
     norad_cat_id = models.PositiveIntegerField()
     name = models.CharField(max_length=45)
     tle = models.CharField(max_length=500, null=True)
-    updated = models.DateTimeField(auto_now_add=True, null=True)
+    updated = models.DateTimeField(auto_now_add=True, blank=True)
 
     def __unicode__(self):
         return self.name
@@ -84,9 +84,9 @@ class Transponder(models.Model):
 
 class Observation(models.Model):
     """Model for SatNOGS observations."""
-    satellite = models.ForeignKey(Satellite, null=True)
+    satellite = models.ForeignKey(Satellite)
     transponder = models.ForeignKey(Transponder, null=True)
-    author = models.ForeignKey(User, null=True)
+    author = models.ForeignKey(User)
     start = models.DateTimeField()
     end = models.DateTimeField()
 
@@ -106,6 +106,6 @@ class Data(models.Model):
     """Model for observation data."""
     start = models.DateTimeField()
     end = models.DateTimeField()
-    observation = models.ForeignKey(Observation, null=True)
-    ground_station = models.ForeignKey(Station, null=True)
+    observation = models.ForeignKey(Observation)
+    ground_station = models.ForeignKey(Station)
     payload = models.FileField(upload_to='data_payloads')