Merge 3816433 into 236a359

.travis.yml

@@ -8,13 +8,13 @@ python:
 env:
   - DJANGO=1.8
   - DJANGO=1.9
-  - DJANGO=master
+  - DJANGO=1.10
 matrix:
   exclude:
     - python: "3.3"
       env: DJANGO=1.9
     - python: "3.3"
-      env: DJANGO=master
+      env: DJANGO=1.10
 install:
   - pip install tox coveralls
 script:

setup.py

@@ -25,14 +25,14 @@ def read(*parts):
     },
     test_suite="runtests.runtests",
     tests_require=[
-        "django-test-plus>=1.0.11",
+        "django-test-plus>=1.0.17",
         "mock>=2.0.0",
     ],
     install_requires=[
         "django-appconf>=1.0.1",
         "django-imagekit>=3.2.7",
         "pilkit>=1.1.13",
-        "pillow>=3.3.0",
+        "pillow>=3.4.2",
         "pytz>=2016.6.1",
     ],
     classifiers=[

tox.ini

@@ -6,18 +6,18 @@ exclude = migrations/*,docs/*
 
 [tox]
 envlist =
-    py27-{1.8,1.9,master},
+    py27-{1.8,1.9,1.10},
     py33-{1.8},
-    py34-{1.8,1.9,master},
-    py35-{1.8,1.9,master}
+    py34-{1.8,1.9,1.10},
+    py35-{1.8,1.9,1.10}
 
 [testenv]
 deps =
     coverage == 4.0.2
     flake8 == 2.5.0
     1.8: Django>=1.8,<1.9
     1.9: Django>=1.9,<1.10
-    master: https://github.com/django/django/tarball/master
+    1.10: Django>=1.10,<1.11
 usedevelop = True
 setenv =
    LANG=en_US.UTF-8