diff --git a/.travis.yml b/.travis.yml index 849949e..db076ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,6 @@ matrix: env: DJANGO_VERSION=1.7 SAMPLE_PROJECT=sample_project install: - - pip install south - pip install django==$DJANGO_VERSION script: diff --git a/sample_project/app/migrations/0001_initial.py b/sample_project/app/migrations/0001_initial.py deleted file mode 100644 index 4633a2e..0000000 --- a/sample_project/app/migrations/0001_initial.py +++ /dev/null @@ -1,123 +0,0 @@ -# -*- 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 'Category' - db.create_table(u'app_category', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('order', self.gf('django.db.models.fields.PositiveIntegerField')(default=1, db_index=True)), - ('title', self.gf('django.db.models.fields.CharField')(max_length=50)), - )) - db.send_create_signal(u'app', ['Category']) - - # Adding model 'Project' - db.create_table(u'app_project', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('order', self.gf('django.db.models.fields.PositiveIntegerField')(default=1, db_index=True)), - ('title', self.gf('django.db.models.fields.CharField')(max_length=50)), - ('category', self.gf('adminsortable.fields.SortableForeignKey')(to=orm['app.Category'])), - ('description', self.gf('django.db.models.fields.TextField')()), - )) - db.send_create_signal(u'app', ['Project']) - - # Adding model 'Credit' - db.create_table(u'app_credit', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('order', self.gf('django.db.models.fields.PositiveIntegerField')(default=1, db_index=True)), - ('project', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['app.Project'])), - ('first_name', self.gf('django.db.models.fields.CharField')(max_length=30)), - ('last_name', self.gf('django.db.models.fields.CharField')(max_length=30)), - )) - db.send_create_signal(u'app', ['Credit']) - - # Adding model 'Note' - db.create_table(u'app_note', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('order', self.gf('django.db.models.fields.PositiveIntegerField')(default=1, db_index=True)), - ('project', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['app.Project'])), - ('text', self.gf('django.db.models.fields.CharField')(max_length=100)), - )) - db.send_create_signal(u'app', ['Note']) - - # Adding model 'GenericNote' - db.create_table(u'app_genericnote', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('order', self.gf('django.db.models.fields.PositiveIntegerField')(default=1, db_index=True)), - ('title', self.gf('django.db.models.fields.CharField')(max_length=50)), - ('content_type', self.gf('django.db.models.fields.related.ForeignKey')(related_name='generic_notes', to=orm['contenttypes.ContentType'])), - ('object_id', self.gf('django.db.models.fields.PositiveIntegerField')()), - )) - db.send_create_signal(u'app', ['GenericNote']) - - - def backwards(self, orm): - # Deleting model 'Category' - db.delete_table(u'app_category') - - # Deleting model 'Project' - db.delete_table(u'app_project') - - # Deleting model 'Credit' - db.delete_table(u'app_credit') - - # Deleting model 'Note' - db.delete_table(u'app_note') - - # Deleting model 'GenericNote' - db.delete_table(u'app_genericnote') - - - models = { - u'app.category': { - 'Meta': {'ordering': "['order']", 'object_name': 'Category'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'app.credit': { - 'Meta': {'ordering': "['order']", 'object_name': 'Credit'}, - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['app.Project']"}) - }, - u'app.genericnote': { - 'Meta': {'ordering': "['order']", 'object_name': 'GenericNote'}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'generic_notes'", 'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'app.note': { - 'Meta': {'ordering': "['order']", 'object_name': 'Note'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['app.Project']"}), - 'text': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - u'app.project': { - 'Meta': {'ordering': "['order']", 'object_name': 'Project'}, - 'category': ('adminsortable.fields.SortableForeignKey', [], {'to': u"orm['app.Category']"}), - 'description': ('django.db.models.fields.TextField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - } - } - - complete_apps = ['app'] \ No newline at end of file diff --git a/sample_project/app/migrations/0002_add_widget.py b/sample_project/app/migrations/0002_add_widget.py deleted file mode 100644 index b7f66b8..0000000 --- a/sample_project/app/migrations/0002_add_widget.py +++ /dev/null @@ -1,78 +0,0 @@ -# -*- 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 'Widget' - db.create_table(u'app_widget', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('order', self.gf('django.db.models.fields.PositiveIntegerField')(default=1, db_index=True)), - ('title', self.gf('django.db.models.fields.CharField')(max_length=50)), - )) - db.send_create_signal(u'app', ['Widget']) - - - def backwards(self, orm): - # Deleting model 'Widget' - db.delete_table(u'app_widget') - - - models = { - u'app.category': { - 'Meta': {'ordering': "['order']", 'object_name': 'Category'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'app.credit': { - 'Meta': {'ordering': "['order']", 'object_name': 'Credit'}, - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['app.Project']"}) - }, - u'app.genericnote': { - 'Meta': {'ordering': "['order']", 'object_name': 'GenericNote'}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'generic_notes'", 'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'app.note': { - 'Meta': {'ordering': "['order']", 'object_name': 'Note'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['app.Project']"}), - 'text': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - u'app.project': { - 'Meta': {'ordering': "['order']", 'object_name': 'Project'}, - 'category': ('adminsortable.fields.SortableForeignKey', [], {'to': u"orm['app.Category']"}), - 'description': ('django.db.models.fields.TextField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'app.widget': { - 'Meta': {'ordering': "['order']", 'object_name': 'Widget'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - } - } - - complete_apps = ['app'] \ No newline at end of file diff --git a/sample_project/app/migrations/0003_add_component.py b/sample_project/app/migrations/0003_add_component.py deleted file mode 100644 index 6442d69..0000000 --- a/sample_project/app/migrations/0003_add_component.py +++ /dev/null @@ -1,86 +0,0 @@ -# -*- 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 'Component' - db.create_table(u'app_component', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('order', self.gf('django.db.models.fields.PositiveIntegerField')(default=1, db_index=True)), - ('title', self.gf('django.db.models.fields.CharField')(max_length=50)), - ('widget', self.gf('adminsortable.fields.SortableForeignKey')(to=orm['app.Widget'])), - )) - db.send_create_signal(u'app', ['Component']) - - - def backwards(self, orm): - # Deleting model 'Component' - db.delete_table(u'app_component') - - - models = { - u'app.category': { - 'Meta': {'ordering': "['order']", 'object_name': 'Category'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'app.component': { - 'Meta': {'ordering': "['order']", 'object_name': 'Component'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}), - 'widget': ('adminsortable.fields.SortableForeignKey', [], {'to': u"orm['app.Widget']"}) - }, - u'app.credit': { - 'Meta': {'ordering': "['order']", 'object_name': 'Credit'}, - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['app.Project']"}) - }, - u'app.genericnote': { - 'Meta': {'ordering': "['order']", 'object_name': 'GenericNote'}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'generic_notes'", 'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'app.note': { - 'Meta': {'ordering': "['order']", 'object_name': 'Note'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['app.Project']"}), - 'text': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - u'app.project': { - 'Meta': {'ordering': "['order']", 'object_name': 'Project'}, - 'category': ('adminsortable.fields.SortableForeignKey', [], {'to': u"orm['app.Category']"}), - 'description': ('django.db.models.fields.TextField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'app.widget': { - 'Meta': {'ordering': "['order']", 'object_name': 'Widget'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - } - } - - complete_apps = ['app'] \ No newline at end of file diff --git a/sample_project/app/migrations/0004_add_person.py b/sample_project/app/migrations/0004_add_person.py deleted file mode 100644 index d2ef25c..0000000 --- a/sample_project/app/migrations/0004_add_person.py +++ /dev/null @@ -1,95 +0,0 @@ -# -*- 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 'Person' - db.create_table(u'app_person', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('order', self.gf('django.db.models.fields.PositiveIntegerField')(default=1, db_index=True)), - ('first_name', self.gf('django.db.models.fields.CharField')(max_length=50)), - ('last_name', self.gf('django.db.models.fields.CharField')(max_length=50)), - ('is_board_member', self.gf('django.db.models.fields.BooleanField')(default=False)), - )) - db.send_create_signal(u'app', ['Person']) - - - def backwards(self, orm): - # Deleting model 'Person' - db.delete_table(u'app_person') - - - models = { - u'app.category': { - 'Meta': {'ordering': "['order']", 'object_name': 'Category'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'app.component': { - 'Meta': {'ordering': "['order']", 'object_name': 'Component'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}), - 'widget': ('adminsortable.fields.SortableForeignKey', [], {'to': u"orm['app.Widget']"}) - }, - u'app.credit': { - 'Meta': {'ordering': "['order']", 'object_name': 'Credit'}, - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['app.Project']"}) - }, - u'app.genericnote': { - 'Meta': {'ordering': "['order']", 'object_name': 'GenericNote'}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'generic_notes'", 'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'app.note': { - 'Meta': {'ordering': "['order']", 'object_name': 'Note'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['app.Project']"}), - 'text': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - u'app.person': { - 'Meta': {'ordering': "['order']", 'object_name': 'Person'}, - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '50'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_board_member': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '50'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}) - }, - u'app.project': { - 'Meta': {'ordering': "['order']", 'object_name': 'Project'}, - 'category': ('adminsortable.fields.SortableForeignKey', [], {'to': u"orm['app.Category']"}), - 'description': ('django.db.models.fields.TextField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'app.widget': { - 'Meta': {'ordering': "['order']", 'object_name': 'Widget'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - } - } - - complete_apps = ['app'] \ No newline at end of file diff --git a/sample_project/app/migrations/__init__.py b/sample_project/app/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/sample_project/requirements.txt b/sample_project/requirements.txt deleted file mode 100644 index 0a26803..0000000 --- a/sample_project/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -django==1.6.6 -south==1.0 diff --git a/sample_project/sample_project/settings.py b/sample_project/sample_project/settings.py index e2f2b6c..e421ffb 100644 --- a/sample_project/sample_project/settings.py +++ b/sample_project/sample_project/settings.py @@ -22,8 +22,6 @@ DATABASES = { } } -SOUTH_TESTS_MIGRATE = False - # Hosts/domain names that are valid for this site; required if DEBUG is False # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts ALLOWED_HOSTS = [] @@ -124,7 +122,6 @@ INSTALLED_APPS = ( 'adminsortable', 'app', - 'south', ) # A sample logging configuration. The only tangible logging