Skip to content

Commit e50664a

Browse files
galuszkakgaluszkak
committed
added support for django 1.8 and test matrix in tox
1 parent dec96e0 commit e50664a

File tree

16 files changed

+162
-102
lines changed

16 files changed

+162
-102
lines changed

‎.travis.yml‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,34 @@ language: python
22

33
python:
44
- "2.7"
5-
- "3.4"
5+
6+
env:
7+
matrix:
8+
- TOX_ENV=py27-dj14
9+
- TOX_ENV=py27-dj15
10+
- TOX_ENV=py27-dj16
11+
- TOX_ENV=py27-dj17
12+
- TOX_ENV=py27-dj18
13+
- TOX_ENV=py33-dj15
14+
- TOX_ENV=py33-dj16
15+
- TOX_ENV=py33-dj17
16+
- TOX_ENV=py33-dj18
17+
- TOX_ENV=py34-dj15
18+
- TOX_ENV=py34-dj16
19+
- TOX_ENV=py34-dj17
20+
- TOX_ENV=py34-dj18
21+
- TOX_ENV=pypy-dj14
22+
- TOX_ENV=pypy-dj15
23+
- TOX_ENV=pypy-dj16
24+
- TOX_ENV=pypy-dj17
25+
- TOX_ENV=pypy-dj18
26+
- TOX_ENV=py27-cov
627

728
install:
8-
- pip install coveralls
29+
- pip install tox
930

1031
script:
11-
- coverage run --source=dj_elastictranscoder setup.py test
32+
- tox -e $TOX_ENV
1233

1334
after_success:
1435
- coveralls

‎dj_elastictranscoder/migrations/0001_initial.py‎

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', '0001_initial'),
11+
]
12+
13+
operations = [
14+
migrations.CreateModel(
15+
name='EncodeJob',
16+
fields=[
17+
('id', models.CharField(max_length=100, serialize=False, primary_key=True)),
18+
('object_id', models.PositiveIntegerField()),
19+
('state', models.PositiveIntegerField(default=0, db_index=True, choices=[(0, b'Submitted'), (1, b'Progressing'), (2, b'Error'), (3, b'Warning'), (4, b'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+
]

‎dj_elastictranscoder/south_migrations/0001_initial.py‎

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.

‎runtests.py‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎setup.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@
1111
author_email='[email protected]',
1212
url='http://github.com/StreetVoice/django-elastic-transcoder',
1313
license='MIT',
14-
test_suite='runtests.runtests',
1514
packages=find_packages(),
1615
include_package_data=True,
1716
zip_safe=False,
1817
install_requires=[
19-
"django >= 1.4, < 1.7",
18+
"django >= 1.4, < 1.9",
2019
"boto >= 2.5",
2120
"South >= 0.8",
2221
],

‎testsapp/__init__.py‎

Whitespace-only changes.

‎dj_elastictranscoder/fixtures/oncomplete.json‎ renamed to ‎testsapp/fixtures/oncomplete.json‎

File renamed without changes.

‎dj_elastictranscoder/fixtures/onerror.json‎ renamed to ‎testsapp/fixtures/onerror.json‎

File renamed without changes.

‎dj_elastictranscoder/fixtures/onprogress.json‎ renamed to ‎testsapp/fixtures/onprogress.json‎

File renamed without changes.

0 commit comments

Comments
 (0)