test against django 1.11 (#2)

* depend on celery < 4.0

Author: thijstriemstra

.travis.yml

@@ -3,7 +3,7 @@ sudo: required
 cache:
   directories:
   - $HOME/.cache/pip
-install: pip install --upgrade pip tox wheel
+install: pip install --upgrade pip setuptools tox wheel
 before_script:
   - wget -q http://johnvansickle.com/ffmpeg/builds/ffmpeg-git-64bit-static.tar.xz
   - tar -xf ffmpeg-*.tar.xz -v
@@ -15,6 +15,14 @@ env:
   - TOXENV=py27-django-17
   - TOXENV=py27-django-18
   - TOXENV=py27-django-19
+  - TOXENV=py27-django-110
+  - TOXENV=py27-django-111
   - TOXENV=py34-django-18
   - TOXENV=py34-django-19
-  - TOXENV=coveralls
+  - TOXENV=py34-django-110
+  - TOXENV=py34-django-111
+  - TOXENV=py35-django-18
+  - TOXENV=py35-django-19
+  - TOXENV=py35-django-110
+  - TOXENV=py35-django-111
+  - TOXENV=coveralls

encode/models.py

@@ -586,6 +586,7 @@ class Meta:
         verbose_name = _("Video Clip")
         verbose_name_plural = _("Video Clips")
 
+
 pre_save.connect(check_file_changed, sender=Video)
 
 
@@ -606,6 +607,7 @@ class Meta:
         verbose_name = _("Audio Clip")
         verbose_name_plural = _("Audio Clips")
 
+
 pre_save.connect(check_file_changed, sender=Audio)
 
 
@@ -626,4 +628,5 @@ class Meta:
         verbose_name = _("Snapshot")
         verbose_name_plural = _("Snapshots")
 
+
 pre_save.connect(check_file_changed, sender=Snapshot)

encode/tests/settings.py

@@ -15,7 +15,12 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'APP_DIRS': True
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.contrib.auth.context_processors.auth',
+            ],
+        },
     },
 ]
 

setup.cfg

@@ -1,3 +1,15 @@
 [flake8]
 ignore = E121, E122, E123, E125, E126, E127, E128
-exclude = doc/*, encode/migrations/*, encode/tests/*
+exclude =
+    .ropeproject,
+    .tox,
+    .eggs,
+    # No need to traverse our git directory
+    .git,
+    # There's no value in checking cache directories
+    __pycache__,
+    doc,
+    build,
+    dist,
+    encode/migrations/*,
+    encode/tests/*

setup.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright Collab 2012-2016
+# Copyright Collab 2012-2017
 # See LICENSE for details.
 
 import os
@@ -37,7 +37,6 @@ def run_tests(self):
     name='django-encode',
     packages=find_packages(),
     include_package_data=True,
-    tests_require=['tox'],
     cmdclass={'test': Tox},
     version=version,
     description='Django media encoding.',
@@ -54,14 +53,18 @@ def run_tests(self):
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5'
     ],
     author='Collab',
     author_email='[email protected]',
     url='http://github.com/collab-project/django-encode',
     license='MIT',
     install_requires=[
-        'celery>=3.1',
+        'celery>=3.1,<4.0',
         'django-appconf>=0.6',
         'django-queued-storage>=0.8.0'
-    ]
+    ],
+    tests_require=[
+        'tox'
+    ],
 )

tox.ini

@@ -1,4 +1,4 @@
-# Copyright Collab 2013-2016
+# Copyright Collab 2013-2017
 # See LICENSE for details.
 #
 # Tox (https://tox.testrun.org/) is a tool for running tests
@@ -9,7 +9,7 @@
 [tox]
 envlist =
     {py27}-django-{17,18,19}
-    {py34}-django-{18,19}
+    {py34,py35,py36}-django-{18,19,110,111}
 skipsdist = False
 skip_missing_interpreters = True
 
@@ -31,6 +31,8 @@ deps =
     django-17: Django>=1.7,<1.8
     django-18: Django>=1.8,<1.9
     django-19: Django>=1.9,<1.10
+    django-110: Django>=1.10,<1.11
+    django-111: Django>=1.11,<2.0.0
     {[base]deps}
 
 
@@ -41,6 +43,6 @@ commands =
     {[testenv]commands}
     coveralls
 deps =
-    Django>=1.8,<1.9
+    Django>=1.11,<2.0.0
     coveralls
     {[base]deps}