Skip to content

Commit 03379f4

Browse files
author
Reed Tomlinson
committed
Merge pull request areedtomlinson#2 from hwkns/master
Removed South dependency, added Django migration
2 parents 0f84489 + 1ecb47b commit 03379f4

File tree

6 files changed

+78
-50
lines changed

6 files changed

+78
-50
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.DS_Store
2+
.idea/
23
/dist
34
*.swp
45
*.pyc

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ language: python
22

33
python:
44
- "2.7"
5+
- "3.3"
6+
- "3.4"
57

68
install:
79
- pip install coveralls
Lines changed: 25 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,26 @@
11
# -*- coding: utf-8 -*-
2-
from south.utils import datetime_utils as datetime
3-
from south.db import db
4-
from south.v2 import SchemaMigration
5-
from django.db import models
6-
7-
8-
class Migration(SchemaMigration):
9-
10-
def forwards(self, orm):
11-
# Adding model 'EncodeJob'
12-
db.create_table(u'dj_elastictranscoder_encodejob', (
13-
('id', self.gf('django.db.models.fields.CharField')(max_length=100, primary_key=True)),
14-
('content_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['contenttypes.ContentType'])),
15-
('object_id', self.gf('django.db.models.fields.PositiveIntegerField')()),
16-
('state', self.gf('django.db.models.fields.PositiveIntegerField')(default=0, db_index=True)),
17-
('message', self.gf('django.db.models.fields.TextField')()),
18-
('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
19-
('last_modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
20-
))
21-
db.send_create_signal(u'dj_elastictranscoder', ['EncodeJob'])
22-
23-
24-
def backwards(self, orm):
25-
# Deleting model 'EncodeJob'
26-
db.delete_table(u'dj_elastictranscoder_encodejob')
27-
28-
29-
models = {
30-
u'contenttypes.contenttype': {
31-
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
32-
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
33-
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
34-
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
35-
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
36-
},
37-
u'dj_elastictranscoder.encodejob': {
38-
'Meta': {'object_name': 'EncodeJob'},
39-
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
40-
'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
41-
'id': ('django.db.models.fields.CharField', [], {'max_length': '100', 'primary_key': 'True'}),
42-
'last_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
43-
'message': ('django.db.models.fields.TextField', [], {}),
44-
'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
45-
'state': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'db_index': 'True'})
46-
}
47-
}
48-
49-
complete_apps = ['dj_elastictranscoder']
2+
from __future__ import unicode_literals
3+
4+
from django.db import models, migrations
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('contenttypes', '0002_remove_content_type_name'),
11+
]
12+
13+
operations = [
14+
migrations.CreateModel(
15+
name='EncodeJob',
16+
fields=[
17+
('id', models.CharField(max_length=100, primary_key=True, serialize=False)),
18+
('object_id', models.PositiveIntegerField()),
19+
('state', models.PositiveIntegerField(default=0, db_index=True, choices=[(0, 'Submitted'), (1, 'Progressing'), (2, 'Error'), (3, 'Warning'), (4, 'Complete')])),
20+
('message', models.TextField()),
21+
('created_at', models.DateTimeField(auto_now_add=True)),
22+
('last_modified', models.DateTimeField(auto_now=True)),
23+
('content_type', models.ForeignKey(to='contenttypes.ContentType')),
24+
],
25+
),
26+
]
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# -*- coding: utf-8 -*-
2+
from south.utils import datetime_utils as datetime
3+
from south.db import db
4+
from south.v2 import SchemaMigration
5+
from django.db import models
6+
7+
8+
class Migration(SchemaMigration):
9+
10+
def forwards(self, orm):
11+
# Adding model 'EncodeJob'
12+
db.create_table(u'dj_elastictranscoder_encodejob', (
13+
('id', self.gf('django.db.models.fields.CharField')(max_length=100, primary_key=True)),
14+
('content_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['contenttypes.ContentType'])),
15+
('object_id', self.gf('django.db.models.fields.PositiveIntegerField')()),
16+
('state', self.gf('django.db.models.fields.PositiveIntegerField')(default=0, db_index=True)),
17+
('message', self.gf('django.db.models.fields.TextField')()),
18+
('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
19+
('last_modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
20+
))
21+
db.send_create_signal(u'dj_elastictranscoder', ['EncodeJob'])
22+
23+
24+
def backwards(self, orm):
25+
# Deleting model 'EncodeJob'
26+
db.delete_table(u'dj_elastictranscoder_encodejob')
27+
28+
29+
models = {
30+
u'contenttypes.contenttype': {
31+
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
32+
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
33+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
34+
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
35+
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
36+
},
37+
u'dj_elastictranscoder.encodejob': {
38+
'Meta': {'object_name': 'EncodeJob'},
39+
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
40+
'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
41+
'id': ('django.db.models.fields.CharField', [], {'max_length': '100', 'primary_key': 'True'}),
42+
'last_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
43+
'message': ('django.db.models.fields.TextField', [], {}),
44+
'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
45+
'state': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'db_index': 'True'})
46+
}
47+
}
48+
49+
complete_apps = ['dj_elastictranscoder']

dj_elastictranscoder/south_migrations/__init__.py

Whitespace-only changes.

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
packages=find_packages(),
1616
include_package_data=True,
1717
zip_safe=False,
18-
install_requires = [
18+
install_requires=[
1919
"django >= 1.4",
2020
"boto >= 2.5",
21-
"South >= 0.8",
2221
],
2322
classifiers=[
2423
"Intended Audience :: Developers",

0 commit comments

Comments
 (0)