Test with pytest from master/features

Fix pytest-dev#76

.travis.yml

@@ -10,29 +10,31 @@ python:
     - pypy
     - nightly
 
-# command to install dependencies
 install: "pip install -U tox"
 
-# command to run tests
-env:
-  matrix:
-    - TOXENV=py-pytest28
-    - TOXENV=py-pytest29
-    - TOXENV=py-pytest30
-
 matrix:
   include:
+    - python: '2.7'
+      env: TOXENV=benchmark
+    - python: '3.6'
+      env: TOXENV=benchmark
     - python: '2.7'
       env: TOXENV=check
     - python: '3.6'
       env: TOXENV=check
+    - python: '3.6'
+      env: TOXENV=docs
     - python: '2.7'
-      env: TOXENV=benchmark
+      env: TOXENV=pytest-master
     - python: '3.6'
-      env: TOXENV=benchmark
+      env: TOXENV=pytest-master
+    - python: '2.7'
+      env: TOXENV=pytest-features
+    - python: '3.6'
+      env: TOXENV=pytest-features
 
 script:
- - tox --recreate -e $TOXENV
+ - tox
 
 notifications:
   irc:

appveyor.yml

@@ -1,3 +1,18 @@
+environment:
+  matrix:
+  # note: please use "tox --listenvs" to populate the build matrix below
+  - TOXENV: "check"
+  - TOXENV: "py26"
+  - TOXENV: "py27"
+  - TOXENV: "py34"
+  - TOXENV: "py35"
+  - TOXENV: "py36"
+  - TOXENV: "pypy"
+  # non-default tox environments
+  - TOXENV: "check"
+  - TOXENV: "docs"
+  - TOXENV: "pytest-master"
+  - TOXENV: "pytest-features"
 
 install:
   - echo Installed Pythons
@@ -18,4 +33,3 @@ build: false  # Not a C# project, build stuff at the test step instead.
 
 test_script:
   - C:\Python35\python -m tox
-

tox.ini

@@ -1,12 +1,20 @@
 [tox]
-envlist=check,py{26,27,34,35,36,py}-pytest{28,29,30}
+envlist=check,py{26,27,34,35,36,py}
 
 [testenv]
 commands=py.test {posargs:testing/}
 deps=
-  pytest28: pytest~=2.8.0
-  pytest29: pytest~=2.9.0
-  pytest30: pytest~=3.0.0
+  pytest
+
+[testenv:pytest-master]
+commands=py.test {posargs:testing/}
+deps=
+  git+https://github.com/pytest-dev/pytest.git@master
+
+[testenv:pytest-features]
+commands=py.test {posargs:testing/}
+deps=
+  git+https://github.com/pytest-dev/pytest.git@features
 
 [testenv:benchmark]
 commands=py.test {posargs:testing/benchmark.py}