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

Subscribers

People subscribed via source and target branches

to all changes: