Test using pytest 3.0

Fix #99

.travis.yml

@@ -5,26 +5,28 @@ python:
 install: pip install -U tox setuptools_scm
 env:
   matrix:
-  - TESTENV=py26-pytest26
+  # note: please use "tox --listenvs" to populate the build matrix
-  - TESTENV=py26-pytest27
+  - TOXENV=py26-pytest27
-  - TESTENV=py26-pytest28
+  - TOXENV=py26-pytest28
-  - TESTENV=py26-pytest29
+  - TOXENV=py26-pytest29
-  - TESTENV=py27-pytest26
+  - TOXENV=py26-pytest30
-  - TESTENV=py27-pytest27
+  - TOXENV=py27-pytest27
-  - TESTENV=py27-pytest28
+  - TOXENV=py27-pytest28
-  - TESTENV=py27-pytest29
+  - TOXENV=py27-pytest29
-  - TESTENV=py34-pytest26
+  - TOXENV=py27-pytest30
-  - TESTENV=py34-pytest27
+  - TOXENV=py34-pytest27
-  - TESTENV=py34-pytest28
+  - TOXENV=py34-pytest28
-  - TESTENV=py34-pytest29
+  - TOXENV=py34-pytest29
-  - TESTENV=py35-pytest27
+  - TOXENV=py34-pytest30
-  - TESTENV=py35-pytest28
+  - TOXENV=py35-pytest27
-  - TESTENV=py35-pytest29
+  - TOXENV=py35-pytest28
-  - TESTENV=py27-pytest28-pexpect
+  - TOXENV=py35-pytest29
-  - TESTENV=py35-pytest28-pexpect
+  - TOXENV=py27-pytest28-pexpect
-  - TESTENV=flakes
+  - TOXENV=py35-pytest28-pexpect
-  - TESTENV=readme
+  - TOXENV=flakes
-script: tox --recreate -e $TESTENV
+  - TOXENV=readme
+
+script: tox
 notifications:
   irc:
     channels:

appveyor.yml

@@ -1,3 +1,26 @@
+environment:
+  matrix:
+  # note: please use "tox --listenvs" to populate the build matrix
+  - TOXENV: "py26-pytest27"
+  - TOXENV: "py26-pytest28"
+  - TOXENV: "py26-pytest29"
+  - TOXENV: "py26-pytest30"
+  - TOXENV: "py27-pytest27"
+  - TOXENV: "py27-pytest28"
+  - TOXENV: "py27-pytest29"
+  - TOXENV: "py27-pytest30"
+  - TOXENV: "py34-pytest27"
+  - TOXENV: "py34-pytest28"
+  - TOXENV: "py34-pytest29"
+  - TOXENV: "py34-pytest30"
+  - TOXENV: "py35-pytest27"
+  - TOXENV: "py35-pytest28"
+  - TOXENV: "py35-pytest29"
+  - TOXENV: "py27-pytest28-pexpect"
+  - TOXENV: "py35-pytest28-pexpect"
+  - TOXENV: "flakes"
+  - TOXENV: "readme"
+
 install:
   - C:\Python35\python -m pip install tox setuptools_scm
 

setup.py

@@ -20,7 +20,7 @@ setup(
         ],
     },
     zip_safe=False,
-    install_requires=['execnet>=1.1', 'pytest>=2.4.2', 'py>=1.4.22'],
+    install_requires=['execnet>=1.1', 'pytest>=2.7.0', 'py>=1.4.22'],
     setup_requires=['setuptools_scm'],
     classifiers=[
         'Development Status :: 5 - Production/Stable',

testing/acceptance_test.py

@@ -62,7 +62,7 @@ class TestDistribution:
                 pass
         """)
         result = testdir.runpytest(p1, '--tx=popen', '--tx=popen')
-        assert result.ret == 1
+        assert result.ret in (1, 2)
         result.stdout.fnmatch_lines([
             "E   ImportError: *__import_of_missing_module*",
         ])

tox.ini

@@ -1,8 +1,7 @@
 [tox]
 # if you change the envlist, please update .travis.yml file as well
 envlist=
-  py{26,27,34}-pytest2{6,7,8,9}
+  py{26,27,34,35}-pytest{27,28,29,30}
-  py35-pytest2{7,8,9}
   py{27,35}-pytest28-pexpect
   flakes
   readme  
@@ -15,10 +14,10 @@ deps =
   pycmd
   # to avoid .eggs
   setuptools_scm
-  pytest26: pytest~=2.6.1
   pytest27: pytest~=2.7.2
   pytest28: pytest~=2.8.7
-  pytest29: pytest~=2.9.1
+  pytest29: pytest~=2.9.2
+  pytest30: pytest~=3.0.5
   pexpect: pexpect
 platform=
   pexpect: linux|darwin