reorganized tox and travis

.travis.yml

@@ -1,22 +1,33 @@
+sudo: false
 language: python
-python:
-  - "2.6"
-  - "2.7"
-  - "3.2"
-  - "3.3"
-  - "3.4"
-  - "pypy"
-  - "pypy3"
-# command to install dependencies
+python: 2.7
+
+cache: pip
+
+env:
+    - TOX_ENV=coveralls
+    - TOX_ENV=py26-django14
+    - TOX_ENV=py26-django15
+    - TOX_ENV=py26-django16
+    - TOX_ENV=py27-django14
+    - TOX_ENV=py27-django15
+    - TOX_ENV=py27-django16
+    - TOX_ENV=py27-django18
+    - TOX_ENV=py34-django15
+    - TOX_ENV=py34-django16
+    - TOX_ENV=py34-django18
+    - TOX_ENV=pypy-django14
+    - TOX_ENV=pypy-django15
+    - TOX_ENV=pypy-django16
+    - TOX_ENV=pypy-django18
+    - TOX_ENV=pypy3-django15
+    - TOX_ENV=pypy3-django16
+    - TOX_ENV=pypy3-django18
+
 install:
-  - pip install -r test_project/requirements.txt
-  - pip install .
-  - pip install coveralls
+    pip install --upgrade pip
+    pip install tox
 
-# command to run tests
 script:
-    - python setup.py test
-
-after_success:
-    - coveralls
+    tox -e $TOX_ENV
 

pytest.ini

@@ -8,7 +8,6 @@ addopts =
     --cov-report term-missing
     --pep8
     --flakes
-    --clearcache
 
 pep8ignore =
     *.py W391

test_project/requirements.txt

@@ -1,4 +1,3 @@
-Django<1.6
 six
 pytest
 pytest-cache

tox.ini

@@ -1,11 +1,37 @@
 [tox]
-envlist = py26,py27,pypy,pypy3,py32,py33,py34
+install_command = pip-accel-for-tox {opts} {packages}
+envlist = 
+    coveralls,
+    py26-django{14,15,16},
+    py27-django{14,15,16,18},
+    py34-django{15,16,18},
+    pypy-django{14,15,16,18},
+    pypy3-django{15,16,18}
+
 skip_missing_interpreters = True
+usedevelop = True
 
 [testenv]
 deps = 
+    django14: Django>=1.4,<1.5
+    django15: Django>=1.5,<1.6
+    django16: Django>=1.6,<1.7
+    django17: Django>=1.7,<1.8
+    django18: Django>=1.8,<1.9
     -rtest_project/requirements.txt
 
+commands = 
+    pip freeze
+    python setup.py test
+
+[testenv:coveralls]
 commands =
-    {envpython} setup.py test
+    pip freeze
+    python setup.py test
+    coveralls
+
+deps =
+    Django>=1.8,<1.9
+    -rtest_project/requirements.txt
+    coveralls