diff --git a/.travis.yml b/.travis.yml index 080d750..4e8d987 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,10 @@ python: - '3.5' - '3.6' env: -- TOXENV=py-pytest34 -- TOXENV=py-pytest35 -- TOXENV=py-pytest36 +- TOXENV=py-pytest30 +- TOXENV=py-pytest31 +- TOXENV=py-pytest32 +- TOXENV=py-pytest33 install: pip install tox setuptools_scm script: tox diff --git a/appveyor.yml b/appveyor.yml index c42501d..2aa53fa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,21 +1,22 @@ environment: matrix: - - TOXENV: "py27-pytest36" - - TOXENV: "py34-pytest36" - - TOXENV: "py35-pytest36" - - TOXENV: "py36-pytest36" - - TOXENV: "py27-pytest36-pexpect" - - TOXENV: "py36-pytest36-pexpect" + # note: please use "tox --listenvs" to populate the build matrix + - TOXENV: "py27-pytest33" + - TOXENV: "py34-pytest33" + - TOXENV: "py35-pytest33" + - TOXENV: "py36-pytest33" + - TOXENV: "py27-pytest33-pexpect" + - TOXENV: "py36-pytest33-pexpect" - TOXENV: "flakes" - TOXENV: "readme" install: - - C:\Python36\python -m pip install -U tox setuptools_scm pip + - C:\Python35\python -m pip install -U tox setuptools_scm pip build: false # Not a C# project, build stuff at the test step instead. test_script: - - C:\Python36\python -m tox + - C:\Python35\python -m tox # We don't deploy anything on tags with AppVeyor, we use Travis instead, so we # might as well save resources diff --git a/setup.py b/setup.py index f8c3f98..becb323 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -install_requires = ['execnet>=1.1', 'pytest>=3.4', 'pytest-forked'] +install_requires = ['execnet>=1.1', 'pytest>=3.0.0', 'pytest-forked'] setup( diff --git a/tox.ini b/tox.ini index 48b9e83..8bda1c2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] # if you change the envlist, please update .travis.yml file as well envlist= - py{27,34,35,36}-pytest{34,35,36} - py{27,36}-pytest36-pexpect + py{27,34,35,36}-pytest{30,31,32,33} + py{27,36}-pytest{30,31,32,33}-pexpect py{27,36}-pytest{master,features} flakes readme @@ -15,9 +15,10 @@ deps = pycmd # to avoid .eggs setuptools_scm - pytest34: pytest~=3.4.0 - pytest35: pytest~=3.5.0 - pytest36: pytest~=3.6.0 + pytest30: pytest~=3.0.5 + pytest31: pytest~=3.1.0 + pytest32: pytest~=3.2.0 + pytest33: pytest~=3.3.0 pytestmaster: git+https://github.com/pytest-dev/pytest.git@master pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features pexpect: pexpect