Merge lp:~nataliabidart/locolander/add-south into lp:locolander

Proposed by Natalia Bidart
Status: Merged
Merged at revision: 6
Proposed branch: lp:~nataliabidart/locolander/add-south
Merge into: lp:locolander
Diff against target: 119 lines (+93/-0)
3 files modified
locolander/locolander/settings.py (+1/-0)
locolander/locolanderweb/migrations/0001_initial.py (+91/-0)
requirements.txt (+1/-0)
To merge this branch: bzr merge lp:~nataliabidart/locolander/add-south
Reviewer Review Type Date Requested Status
Loco Lander Approve
Review via email: mp+170924@code.launchpad.net

Commit message

- Added south.

To post a comment you must log in.
Revision history for this message
Loco Lander (locolander) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'locolander/locolander/settings.py'
2--- locolander/locolander/settings.py 2013-06-21 20:26:50 +0000
3+++ locolander/locolander/settings.py 2013-06-21 23:53:25 +0000
4@@ -132,6 +132,7 @@
5 # Uncomment the next line to enable admin documentation:
6 # 'django.contrib.admindocs',
7 'locolanderweb',
8+ 'south',
9 )
10
11 # A sample logging configuration. The only tangible logging
12
13=== added directory 'locolander/locolanderweb/migrations'
14=== added file 'locolander/locolanderweb/migrations/0001_initial.py'
15--- locolander/locolanderweb/migrations/0001_initial.py 1970-01-01 00:00:00 +0000
16+++ locolander/locolanderweb/migrations/0001_initial.py 2013-06-21 23:53:25 +0000
17@@ -0,0 +1,91 @@
18+# -*- coding: utf-8 -*-
19+import datetime
20+from south.db import db
21+from south.v2 import SchemaMigration
22+from django.db import models
23+
24+
25+class Migration(SchemaMigration):
26+
27+ def forwards(self, orm):
28+ # Adding model 'Project'
29+ db.create_table(u'locolanderweb_project', (
30+ (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
31+ ('owner', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
32+ ('url', self.gf('django.db.models.fields.URLField')(max_length=200)),
33+ ('name', self.gf('django.db.models.fields.TextField')()),
34+ ))
35+ db.send_create_signal(u'locolanderweb', ['Project'])
36+
37+ # Adding model 'RunLog'
38+ db.create_table(u'locolanderweb_runlog', (
39+ (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
40+ ('project', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['locolanderweb.Project'])),
41+ ('timestamp', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.utcnow)),
42+ ('raw', self.gf('django.db.models.fields.TextField')()),
43+ ))
44+ db.send_create_signal(u'locolanderweb', ['RunLog'])
45+
46+
47+ def backwards(self, orm):
48+ # Deleting model 'Project'
49+ db.delete_table(u'locolanderweb_project')
50+
51+ # Deleting model 'RunLog'
52+ db.delete_table(u'locolanderweb_runlog')
53+
54+
55+ models = {
56+ u'auth.group': {
57+ 'Meta': {'object_name': 'Group'},
58+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
59+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
60+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
61+ },
62+ u'auth.permission': {
63+ 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
64+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
65+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
66+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
67+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
68+ },
69+ u'auth.user': {
70+ 'Meta': {'object_name': 'User'},
71+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
72+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
73+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
74+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
75+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
76+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
77+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
78+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
79+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
80+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
81+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
82+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
83+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
84+ },
85+ u'contenttypes.contenttype': {
86+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
87+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
88+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
89+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
90+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
91+ },
92+ u'locolanderweb.project': {
93+ 'Meta': {'object_name': 'Project'},
94+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
95+ 'name': ('django.db.models.fields.TextField', [], {}),
96+ 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
97+ 'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
98+ },
99+ u'locolanderweb.runlog': {
100+ 'Meta': {'object_name': 'RunLog'},
101+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
102+ 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['locolanderweb.Project']"}),
103+ 'raw': ('django.db.models.fields.TextField', [], {}),
104+ 'timestamp': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
105+ }
106+ }
107+
108+ complete_apps = ['locolanderweb']
109\ No newline at end of file
110
111=== added file 'locolander/locolanderweb/migrations/__init__.py'
112=== modified file 'requirements.txt'
113--- requirements.txt 2013-06-20 22:59:33 +0000
114+++ requirements.txt 2013-06-21 23:53:25 +0000
115@@ -2,3 +2,4 @@
116 mock==1.0.1
117 pep8==1.4.5
118 pyflakes==0.7.2
119+South==0.8.1

Subscribers

People subscribed via source and target branches

to all changes: