incorporate south

Refs: #1680

diff --git a/README b/README
index 0b4c4be..70504e7 100644 (file)
--- a/README
+++ b/README
@@ -39,6 +39,7 @@ Enter the pithos dir, copy settings.py.dist to settings.py.
 
 Then run:
     python manage.py syncdb
+    python manage.py schemamigration im --initial
     python manage.py loaddata admin_user
     python manage.py runserver
 

diff --git a/README.upgrade b/README.upgrade
index b73508e..5449575 100644 (file)
--- a/README.upgrade
+++ b/README.upgrade
@@ -12,3 +12,9 @@ UPGRADE
     
     ALTER TABLE im_user ADD COLUMN 'password' VARCHAR(255);
 
+0.7.10 -> 0.7.11
+----------------
+*setup south:
+    python manage.py syncdb
+    python manage.py migrate im 0001 --fake
+    python manage.py migrate im

diff --git a/docs/source/adminguide.rst b/docs/source/adminguide.rst
index 9b9ed22..cf3d36e 100644 (file)
--- a/docs/source/adminguide.rst
+++ b/docs/source/adminguide.rst
@@ -22,6 +22,7 @@ Setup the files (choose where to store data in ``settings.py`` and change ``SECR
   cd /pithos/pithos
   cp settings.py.dist settings.py
   python manage.py syncdb
+  python manage.py schemamigration im --initial
   cd /pithos
   python setup.py build_sphinx
 

diff --git a/pithos/im/migrations/0001_initial.py b/pithos/im/migrations/0001_initial.py
new file mode 100644 (file)
index 0000000..4c0b4e0
--- /dev/null
+++ b/pithos/im/migrations/0001_initial.py
@@ -0,0 +1,86 @@
+# encoding: 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 'User'
+        db.create_table('im_user', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('uniq', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)),
+            ('realname', self.gf('django.db.models.fields.CharField')(default='', max_length=255)),
+            ('email', self.gf('django.db.models.fields.CharField')(default='', max_length=255)),
+            ('affiliation', self.gf('django.db.models.fields.CharField')(default='', max_length=255)),
+            ('state', self.gf('django.db.models.fields.CharField')(default='ACTIVE', max_length=16)),
+            ('level', self.gf('django.db.models.fields.IntegerField')(default=4)),
+            ('invitations', self.gf('django.db.models.fields.IntegerField')(default=0)),
+            ('password', self.gf('django.db.models.fields.CharField')(default='', max_length=255)),
+            ('is_admin', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('auth_token', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
+            ('auth_token_created', self.gf('django.db.models.fields.DateTimeField')(null=True)),
+            ('auth_token_expires', self.gf('django.db.models.fields.DateTimeField')(null=True)),
+            ('created', self.gf('django.db.models.fields.DateTimeField')()),
+            ('updated', self.gf('django.db.models.fields.DateTimeField')()),
+        ))
+        db.send_create_signal('im', ['User'])
+
+        # Adding model 'Invitation'
+        db.create_table('im_invitation', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('inviter', self.gf('django.db.models.fields.related.ForeignKey')(related_name='invitations_sent', null=True, to=orm['im.User'])),
+            ('realname', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('uniq', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('code', self.gf('django.db.models.fields.BigIntegerField')(db_index=True)),
+            ('is_accepted', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+            ('accepted', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
+        ))
+        db.send_create_signal('im', ['Invitation'])
+
+
+    def backwards(self, orm):
+        
+        # Deleting model 'User'
+        db.delete_table('im_user')
+
+        # Deleting model 'Invitation'
+        db.delete_table('im_invitation')
+
+
+    models = {
+        'im.invitation': {
+            'Meta': {'object_name': 'Invitation'},
+            'accepted': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.User']"}),
+            'is_accepted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'uniq': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'im.user': {
+            'Meta': {'object_name': 'User'},
+            'affiliation': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}),
+            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'email': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'is_admin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
+            'password': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}),
+            'realname': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "'ACTIVE'", 'max_length': '16'}),
+            'uniq': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {})
+        }
+    }
+
+    complete_apps = ['im']

diff --git a/pithos/im/migrations/__init__.py b/pithos/im/migrations/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/pithos/settings.py.dist b/pithos/settings.py.dist
index be3ecb8..1c791de 100644 (file)
--- a/pithos/settings.py.dist
+++ b/pithos/settings.py.dist
@@ -154,7 +154,8 @@ INSTALLED_APPS = (
     'pithos.im',
     'pithos.api',
     'pithos.public',
-    'pithos.ui'
+    'pithos.ui',
+    'south'
 )
 
 # Set the expiration time of newly created auth tokens