Merge pull request StreetVoice#6 from galuszkak/master

added support for django 1.8 and test matrix in tox

Author: tzangms

.travis.yml

@@ -2,13 +2,33 @@ language: python
 
 python:
   - "2.7"
-  - "3.4"
+
+env:
+  matrix:
+    - TOX_ENV=py27-dj14
+    - TOX_ENV=py27-dj15
+    - TOX_ENV=py27-dj16
+    - TOX_ENV=py27-dj17
+    - TOX_ENV=py27-dj18
+    - TOX_ENV=py33-dj15
+    - TOX_ENV=py33-dj16
+    - TOX_ENV=py33-dj17
+    - TOX_ENV=py33-dj18
+    - TOX_ENV=py34-dj15
+    - TOX_ENV=py34-dj16
+    - TOX_ENV=py34-dj17
+    - TOX_ENV=py34-dj18
+    - TOX_ENV=pypy-dj14
+    - TOX_ENV=pypy-dj15
+    - TOX_ENV=pypy-dj16
+    - TOX_ENV=pypy-dj17
+    - TOX_ENV=pypy-dj18
+    - TOX_ENV=py27-cov
 
 install:
-  - pip install coveralls
+  - pip install tox
 
 script:
-  - coverage run --source=dj_elastictranscoder setup.py test
-
+  - tox -e $TOX_ENV
 after_success:
   - coveralls

dj_elastictranscoder/migrations/0001_initial.py

@@ -1,49 +1,26 @@
 # -*- coding: utf-8 -*-
-from south.utils import datetime_utils as 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 'EncodeJob'
-        db.create_table(u'dj_elastictranscoder_encodejob', (
-            ('id', self.gf('django.db.models.fields.CharField')(max_length=100, primary_key=True)),
-            ('content_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['contenttypes.ContentType'])),
-            ('object_id', self.gf('django.db.models.fields.PositiveIntegerField')()),
-            ('state', self.gf('django.db.models.fields.PositiveIntegerField')(default=0, db_index=True)),
-            ('message', self.gf('django.db.models.fields.TextField')()),
-            ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-            ('last_modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
-        ))
-        db.send_create_signal(u'dj_elastictranscoder', ['EncodeJob'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'EncodeJob'
-        db.delete_table(u'dj_elastictranscoder_encodejob')
-
-
-    models = {
-        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'})
-        },
-        u'dj_elastictranscoder.encodejob': {
-            'Meta': {'object_name': 'EncodeJob'},
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.CharField', [], {'max_length': '100', 'primary_key': 'True'}),
-            'last_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'message': ('django.db.models.fields.TextField', [], {}),
-            'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'state': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'db_index': 'True'})
-        }
-    }
-
-    complete_apps = ['dj_elastictranscoder']
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='EncodeJob',
+            fields=[
+                ('id', models.CharField(max_length=100, serialize=False, primary_key=True)),
+                ('object_id', models.PositiveIntegerField()),
+                ('state', models.PositiveIntegerField(default=0, db_index=True, choices=[(0, b'Submitted'), (1, b'Progressing'), (2, b'Error'), (3, b'Warning'), (4, b'Complete')])),
+                ('message', models.TextField()),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('last_modified', models.DateTimeField(auto_now=True)),
+                ('content_type', models.ForeignKey(to='contenttypes.ContentType')),
+            ],
+        ),
+    ]

dj_elastictranscoder/south_migrations/0001_initial.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as 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 'EncodeJob'
+        db.create_table(u'dj_elastictranscoder_encodejob', (
+            ('id', self.gf('django.db.models.fields.CharField')(max_length=100, primary_key=True)),
+            ('content_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['contenttypes.ContentType'])),
+            ('object_id', self.gf('django.db.models.fields.PositiveIntegerField')()),
+            ('state', self.gf('django.db.models.fields.PositiveIntegerField')(default=0, db_index=True)),
+            ('message', self.gf('django.db.models.fields.TextField')()),
+            ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+            ('last_modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
+        ))
+        db.send_create_signal(u'dj_elastictranscoder', ['EncodeJob'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'EncodeJob'
+        db.delete_table(u'dj_elastictranscoder_encodejob')
+
+
+    models = {
+        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'})
+        },
+        u'dj_elastictranscoder.encodejob': {
+            'Meta': {'object_name': 'EncodeJob'},
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.CharField', [], {'max_length': '100', 'primary_key': 'True'}),
+            'last_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'message': ('django.db.models.fields.TextField', [], {}),
+            'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'state': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'db_index': 'True'})
+        }
+    }
+
+    complete_apps = ['dj_elastictranscoder']

dj_elastictranscoder/south_migrations/__init__.py

@@ -11,12 +11,11 @@
     author_email='[email protected]',
     url='http://github.com/StreetVoice/django-elastic-transcoder',
     license='MIT',
-    test_suite='runtests.runtests',
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,
     install_requires=[
-        "django >= 1.4, < 1.7",
+        "django >= 1.4, < 1.9",
         "boto >= 2.5",
         "South >= 0.8",
     ],

runtests.py

@@ -0,0 +1,4 @@
+from django.db import models
+
+class Item(models.Model):
+    name = models.CharField(max_length=100)

setup.py

@@ -0,0 +1,5 @@
+pytest
+pytest-django
+pytest-cov
+boto
+south

testsapp/__init__.py

@@ -6,22 +6,21 @@
 from django.db import models
 from django.contrib.contenttypes.models import ContentType
 
-from .models import EncodeJob
-from .signals import (
+from dj_elastictranscoder.models import EncodeJob
+from dj_elastictranscoder.signals import (
     transcode_onprogress, 
     transcode_onerror, 
     transcode_oncomplete
 )
 
+from .models import Item
+
 
 
 PROJECT_ROOT = os.path.dirname(os.path.realpath(__file__))
 FIXTURE_DIRS = os.path.join(PROJECT_ROOT, 'fixtures')
 
 
-class Item(models.Model):
-    name = models.CharField(max_length=100)
-
 # ======================
 # define signal receiver
 # ======================

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

@@ -0,0 +1,19 @@
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': ':memory:'
+    }
+}
+INSTALLED_APPS = [
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'dj_elastictranscoder',
+    'testsapp',
+]
+SITE_ID = 1
+DEBUG = False
+ROOT_URLCONF = ''
+SECRET_KEY='test'

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

@@ -0,0 +1,33 @@
+[tox]
+# for py 3.x we are using only django 1.6.x as 1.5.x had only "experimental py3 support"
+envlist =
+    py{27,py}-dj{14,15,16,17,18},
+    py{33,34}-dj{15,16,17,18},
+    py27-cov
+skipsdist = True
+usedevelop = True
+
+[testenv]
+commands = {posargs:py.test --create-db -vv}
+basepython =
+    py27: python2.7
+    py33: python3.3
+    py34: python3.4
+    pypy: pypy
+deps =
+    -rtestsapp/requirements.txt
+    dj14: django>=1.4,<1.4.999
+    dj15: django>=1.5,<1.5.999
+    dj16: django>=1.6,<1.6.999
+    dj17: django>=1.7,<1.7.999
+    dj18: django>=1.8,<1.8.999
+    dj19: https://github.com/django/django/archive/master.tar.gz#egg=django
+setenv =
+    DJANGO_SETTINGS_MODULE = testsapp.tests_settings
+    PYTHONPATH = {toxinidir}/testsapp:{toxinidir}
+
+[testenv:py27-cov]
+commands = py.test --cov=dj_elastictranscoder
+deps =
+    -rtestsapp/requirements.txt
+    django>=1.8,<1.8.999