Upgraded the app to be compatible with Django 1.10+, removed compatibility for Django < 1.8

Author: mbertrand

Diff for: .travis.yml

@@ -2,28 +2,17 @@ language: python
 
 python:
   - "2.7"
+  - "3.6"
 
 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
+    - TOX_ENV=py27-dj19
+    - TOX_ENV=py27-dj100
+    - TOX_ENV=py36-dj18
+    - TOX_ENV=py36-dj19
+    - TOX_ENV=py36-dj100
+    - TOX_ENV=py36-cov
 
 install:
   - pip install tox

Diff for: README.rst

@@ -136,3 +136,10 @@ This package provide various signals for you to get notification, and do more th
    :target: https://travis-ci.org/StreetVoice/django-elastic-transcoder
 .. |Coverage Status| image:: https://coveralls.io/repos/StreetVoice/django-elastic-transcoder/badge.png?branch=master
    :target: https://coveralls.io/r/StreetVoice/django-elastic-transcoder?branch=master
+
+Run Tests
+-----------
+
+.. code:: sh
+    $ pip install -r test_requirements.txt
+    $ tox

Diff for: dj_elastictranscoder/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from .models import EncodeJob
+from dj_elastictranscoder.models import EncodeJob
 
 class EncodeJobAdmin(admin.ModelAdmin):
     list_display = ('id', 'state', 'message')

Diff for: dj_elastictranscoder/migrations/0001_initial.py

@@ -16,7 +16,7 @@ class Migration(migrations.Migration):
             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')])),
+                ('state', models.PositiveIntegerField(choices=[(0, 'Submitted'), (1, 'Progressing'), (2, 'Error'), (3, 'Warning'), (4, 'Complete')], db_index=True, default=0)),
                 ('message', models.TextField()),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('last_modified', models.DateTimeField(auto_now=True)),

Diff for: dj_elastictranscoder/models.py

@@ -1,10 +1,7 @@
 from django.db import models
 from django.contrib.contenttypes.models import ContentType
-import django
-if django.get_version() >= '1.8':
-    from django.contrib.contenttypes.fields import GenericForeignKey
-else:
-    from django.contrib.contenttypes.generic import GenericForeignKey
+from django.contrib.contenttypes.fields import GenericForeignKey
+
 
 
 class EncodeJob(models.Model):

Diff for: dj_elastictranscoder/south_migrations/0001_initial.py

@@ -3,7 +3,7 @@
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 
-from .models import EncodeJob
+from dj_elastictranscoder.models import EncodeJob
 
 
 class Transcoder(object):

Diff for: dj_elastictranscoder/south_migrations/__init__.py

@@ -1,8 +1,6 @@
-try:
-    from django.conf.urls import url, patterns
-except ImportError:
-    from django.conf.urls.defaults import url, patterns  # Support for Django < 1.4
+from django.conf.urls import url
+
+from dj_elastictranscoder.views import endpoint as transcoder_endpoint
+
+urlpatterns = (url(r'^endpoint/$', transcoder_endpoint, name='transcoder_endpoint'),)
 
-urlpatterns = patterns('dj_elastictranscoder.views',
-    url(r'^endpoint/$', 'endpoint'),
-)

Diff for: dj_elastictranscoder/transcoder.py

@@ -4,8 +4,8 @@
 from django.views.decorators.csrf import csrf_exempt
 from django.core.mail import mail_admins
 
-from .models import EncodeJob
-from .signals import (
+from dj_elastictranscoder.models import EncodeJob
+from dj_elastictranscoder.signals import (
     transcode_onprogress,
     transcode_onerror,
     transcode_oncomplete

Diff for: dj_elastictranscoder/urls.py

@@ -15,9 +15,8 @@
     include_package_data=True,
     zip_safe=False,
     install_requires=[
-        "django >= 1.3, < 1.9",
+        "django >= 1.8",
         "boto3 >= 1.1",
-        "South >= 0.8",
     ],
     classifiers=[
         "Intended Audience :: Developers",

Diff for: dj_elastictranscoder/views.py

@@ -0,0 +1 @@
+tox

Diff for: setup.py

@@ -2,4 +2,3 @@ pytest
 pytest-django
 pytest-cov
 boto
-south

Diff for: test_requirements.txt

@@ -13,7 +13,7 @@
     transcode_oncomplete
 )
 
-from .models import Item
+from testsapp.models import Item
 
 
 

Diff for: testsapp/requirements.txt

@@ -15,5 +15,5 @@
 ]
 SITE_ID = 1
 DEBUG = False
-ROOT_URLCONF = ''
+ROOT_URLCONF = 'dj_elastictranscoder.urls'
 SECRET_KEY='test'

Diff for: testsapp/test_job.py

@@ -1,9 +1,8 @@
 [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
+    py{27}-dj{18,19,100},
+    py{36}-dj{18,19,100},
+    py36-cov
 skipsdist = True
 usedevelop = True
 
@@ -13,21 +12,19 @@ basepython =
     py27: python2.7
     py33: python3.3
     py34: python3.4
-    pypy: pypy
+    py35: python3.5
+    py36: python3.6
 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
+    dj19: django>=1.9,<1.9.999
+    dj100: django>=1.10
 setenv =
     DJANGO_SETTINGS_MODULE = testsapp.tests_settings
     PYTHONPATH = {toxinidir}/testsapp:{toxinidir}
 
-[testenv:py27-cov]
+[testenv:py36-cov]
 commands = py.test --cov=dj_elastictranscoder
 deps =
     -rtestsapp/requirements.txt
-    django>=1.8,<1.8.999
+    django>=1.8