Make tox run with django 1.9 and django 1.10

pennersr · Aug 15, 2016 · 721ddaf · 721ddaf
1 parent 8e22ac3
commit 721ddaf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,10 @@
 language: python
 python: 2.7
 env:
-    - TOX_ENV=py27
-    - TOX_ENV=py34
+    - TOX_ENV=py27-django19
+    - TOX_ENV=py34-django19
+    - TOX_ENV=py27-django110
+    - TOX_ENV=py34-django110
 install:
   - pip install tox
   - pip install "coverage>=3.7.1" coveralls

diff --git a/setup.py b/setup.py
@@ -51,7 +51,7 @@ def read_files(*filenames):
     packages=find_packages(),
     include_package_data=True,
     install_requires=[
-        'django>=1.10',
+        'django>=1.9',
         'pytz'
     ],
     cmdclass={'test': DjangoTests},

diff --git a/tox.ini b/tox.ini
@@ -1,14 +1,16 @@
 [tox]
 distribute = False
 envlist =
-    py27, py34
+    {py27,py34}-django19
+    {py27,py34}-django110
 
 
 [testenv]
 setenv = DJANGO_SETTINGS_MODULE=trackstats.tests.settings
 usedevelop = True
 deps =
-    Django
+    django19: Django==1.9.9
+    django110: Django==1.10
     pytz
     coverage
 commands =