Merge pull request #24 from fschulze/tox-travis

Fix Travis tests

.travis.yml

@@ -2,22 +2,31 @@
 language: python
 sudo: false
 
-env:
-  - TOXENV=py26
-  - TOXENV=py27
-  - TOXENV=py33
-  - TOXENV=py34
-# - TOXENV=py35
-  - TOXENV=pypy
-  - TOXENV=pypy3
-  - TOXENV=cover
+matrix:
+  include:
+    - python: 2.6
+    - python: 2.7
+    - python: 3.4
+    - python: 3.5
+    - python: 3.6
+    - python: pypy
+    - python: pypy3
+    - python: nightly
+    - python: 3.5
+      env: TOXENV=py2-cover,py3-cover,coverage
+  allow_failures:
+    - python: nightly
 
 install:
-  - travis_retry pip install tox
+  - travis_retry pip install tox-travis
 
 script:
   - travis_retry tox
 
+cache:
+  directories:
+    - $HOME/.cache/pip
+
 notifications:
   email:
     - pyramid-checkins@lists.repoze.org

tox.ini

@@ -1,25 +1,69 @@
 [tox]
-envlist = 
-    py26,py27,pypy,py33,py34,py35,pypy3,cover
+envlist =
+    py26{-pyramid15,-pyramid16,-pyramid17},{py27,pypy,py33,py34,py35,py36,pypy3}{,-pyramid15,-pyramid16,-pyramid17},
+    {py2,py3}-cover,coverage
 
 [testenv]
-commands = 
+# Most of these are defaults but if you specify any you can't fall back
+# to defaults for others.
+basepython =
+    py26: python2.6
+    py27: python2.7
+    py33: python3.3
+    py34: python3.4
+    py35: python3.5
+    py36: python3.6
+    py37: python3.7
+    pypy: pypy
+    pypy3: pypy3
+    py2: python2.7
+    py3: python3.5
+
+commands =
     python setup.py -q dev
     python setup.py -q test -q
 
-[testenv:cover]
-basepython =
-    python2.7
-commands = 
-    python setup.py -q dev
-    nosetests --with-xunit --with-xcoverage --cover-min-percentage=100
 deps =
-    nose
-    coverage
-    nosexcover
+    py26: WebTest<=2.0.23
+    pyramid15: pyramid>=1.5,<1.6dev
+    pyramid16: pyramid>=1.6,<1.7dev
+    pyramid17: pyramid>=1.7,<1.8dev
 
 # we separate coverage into its own testenv because a) "last run wins" wrt
 # cobertura jenkins reporting and b) pypy and jython can't handle any
 # combination of versions of coverage and nosexcover that i can find.
 # coverage==3.4 is required by nosexcover.
 
+[testenv:py2-cover]
+commands =
+    python setup.py -q dev
+    nosetests --with-xunit --with-xcoverage --xcoverage-file=coverage-py2.xml
+deps =
+    nose
+    coverage
+    nosexcover
+setenv =
+    COVERAGE_FILE=.coverage.py2
+
+[testenv:py3-cover]
+commands =
+    python setup.py -q dev
+    nosetests --with-xunit --with-xcoverage --xcoverage-file=coverage-py3.xml
+deps =
+    nose
+    coverage
+    nosexcover
+setenv =
+    COVERAGE_FILE=.coverage.py3
+
+[testenv:coverage]
+basepython = python3.5
+commands =
+    coverage erase
+    coverage combine
+    coverage report --show-missing --fail-under=100
+deps =
+    coverage
+setenv =
+    COVERAGE_FILE=.coverage
+