Merge fcfaf79 into a618fee

.travis.yml

@@ -7,26 +7,26 @@ python:
   - 3.3
 
 env:
-  - DJANGO=Django==1.4.13
-  - DJANGO=Django==1.5.8
-  - DJANGO=Django==1.6.5
+  - DJANGO="Django>=1.4,<1.5"
+  - DJANGO="Django>=1.6,<1.7"
   - DJANGO="Django>=1.7,<1.8"
 
 install:
-  - pip install coverage coveralls $DJANGO --use-mirrors
+  - pip install -U coverage coveralls $DJANGO
+  - python -c 'from __future__ import print_function; import django; print("Django " + django.get_version())'
 
 script: coverage run -a setup.py test
 
 matrix:
   exclude:
    - python: 2.6
-     env: DJANGO=Django==1.6.5
+     env: DJANGO="Django>=1.6,<1.7"
    - python: 2.6
      env: DJANGO="Django>=1.7,<1.8"
    - python: 3.2
-     env: DJANGO=Django==1.4.13
+     env: DJANGO="Django>=1.4,<1.5"
    - python: 3.3
-     env: DJANGO=Django==1.4.13
+     env: DJANGO="Django>=1.4,<1.5"
 
   include:
    - python: 3.4

Makefile

@@ -14,7 +14,7 @@ clean-pyc:
 	find . -name '*~' -exec rm -f {} +
 
 init:
-	pip install tox coverage Sphinx
+	pip install tox>=1.8 coverage Sphinx
 
 test:
 	coverage erase

tox.ini

@@ -1,145 +1,36 @@
 [tox]
 envlist =
-    py26-1.4, py26-1.5, py26-1.6,
-    py27-1.4, py27-1.5, py27-1.6, py27-1.7, py27-trunk,
-    py32-1.5, py32-1.6, py32-1.7, py32-trunk,
-    py33-1.5, py33-1.6, py33-1.7, py33-trunk,
-    py34-1.7, py34-trunk,
+    py{26,27}-django14,
+    py{26,27,32,33}-django16,
+    py{27,32,33,34}-django17,
+    py{27,32,33,34}-djangotrunk,
     docs, flake8
 
 
-[testenv]
-commands = coverage run -a --branch setup.py test
-
-
-[testenv:docs]
-changedir = docs
-deps =
-    Sphinx
-commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
-
-
 [flake8]
 ignore = N802
 max-complexity = 10
 exclude = __init__.py
 
+
 [testenv:flake8]
 deps = flake8
 commands = flake8 simple_history
 
-[testenv:py26-1.4]
-basepython = python2.6
-deps =
-    django == 1.4.13
-    coverage == 3.6
-
-[testenv:py26-1.5]
-basepython = python2.6
-deps =
-    django == 1.5.8
-    coverage == 3.6
-
-[testenv:py26-1.6]
-basepython = python2.6
-deps =
-    django == 1.6.5
-    coverage == 3.6
-
-[testenv:py26-trunk]
-basepython = python2.6
-deps =
-    https://github.com/django/django/tarball/master
-    coverage == 3.6
-
-[testenv:py27-1.4]
-basepython = python2.7
-deps =
-    django == 1.4.13
-    coverage == 3.6
-
-[testenv:py27-1.5]
-basepython = python2.7
-deps =
-    django == 1.5.8
-    coverage == 3.6
-
-[testenv:py27-1.6]
-basepython = python2.7
-deps =
-    django == 1.6.5
-    coverage == 3.6
-
-[testenv:py27-1.7]
-basepython = python2.7
-deps =
-    django >= 1.7, < 1.8
-    coverage == 3.6
-
-[testenv:py27-trunk]
-basepython = python2.7
-deps =
-    https://github.com/django/django/tarball/master
-    coverage == 3.6
-
-
-[testenv:py32-1.5]
-basepython = python3.2
-deps =
-    django == 1.5.8
-    coverage == 3.6
-
-[testenv:py32-1.6]
-basepython = python3.2
-deps =
-    django == 1.6.5
-    coverage == 3.6
-
-[testenv:py32-1.7]
-basepython = python3.2
-deps =
-    django >= 1.7, < 1.8
-    coverage == 3.6
-
-[testenv:py32-trunk]
-basepython = python3.2
-deps =
-    https://github.com/django/django/tarball/master
-    coverage == 3.6
-
 
-[testenv:py33-1.5]
-basepython = python3.3
-deps =
-    django == 1.5.8
-    coverage == 3.6
-
-[testenv:py33-1.6]
-basepython = python3.3
-deps =
-    django == 1.6.5
-    coverage == 3.6
-
-[testenv:py33-1.7]
-basepython = python3.3
-deps =
-    django >= 1.7, < 1.8
-    coverage == 3.6
-
-[testenv:py33-trunk]
-basepython = python3.3
+[testenv:docs]
+changedir = docs
 deps =
-    https://github.com/django/django/tarball/master
-    coverage == 3.6
+    Sphinx
+commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
 
-[testenv:py34-1.7]
-basepython = python3.4
-deps =
-    django >= 1.7, < 1.8
-    coverage == 3.6
 
-[testenv:py34-trunk]
-basepython = python3.4
+[testenv]
 deps =
-    https://github.com/django/django/tarball/master
-    coverage == 3.6
+    coverage
+    py26: unittest2
+    django14: Django>=1.4,<1.5
+    django16: Django>=1.6,<1.7
+    django17: Django>=1.7,<1.8
+    djangotrunk: https://github.com/django/django/tarball/master
+commands = coverage run -a --branch setup.py test