diff --git a/.travis.yml b/.travis.yml index 0a069cc4..8952a4ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,10 @@ python: - '3.5' - '3.6' env: -- TOXENV=py-pytest34 -- TOXENV=py-pytest35 +- TOXENV=py-pytest30 +- TOXENV=py-pytest31 +- TOXENV=py-pytest32 +- TOXENV=py-pytest33 - TOXENV=py-pytest36 install: pip install tox setuptools_scm diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 35199550..bd08eb60 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,16 @@ +pytest-xdist 1.22.5 (2018-07-27) +================================ + +Bug Fixes +--------- + +- `#321 `_: Revert change that dropped support for ``pytest<3.4`` and require ``six``. + + This change caused problems in some installations, and was a mistaken + in the first place as we should not change version requirements + in bug-fix releases unless they fix an actual bug. + + pytest-xdist 1.22.4 (2018-07-27) ================================ diff --git a/appveyor.yml b/appveyor.yml index 7e8ef39c..bc785971 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,11 +1,13 @@ environment: matrix: - - TOXENV: "py27-pytest36" - - TOXENV: "py34-pytest36" - - TOXENV: "py35-pytest36" + # note: please use "tox --listenvs" to populate the build matrix + - TOXENV: "py27-pytest33" + - TOXENV: "py34-pytest33" + - TOXENV: "py35-pytest33" + - TOXENV: "py36-pytest33" - TOXENV: "py36-pytest36" - - TOXENV: "py27-pytest36-pexpect" - - TOXENV: "py36-pytest36-pexpect" + - TOXENV: "py27-pytest33-pexpect" + - TOXENV: "py36-pytest33-pexpect" install: - C:\Python36\python -m pip install -U tox setuptools_scm pip diff --git a/setup.py b/setup.py index 4c57d371..fcd29610 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", "six"] setup( diff --git a/tox.ini b/tox.ini index f1273da4..11afb372 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ # if you change the envlist, please update .travis.yml file as well envlist= linting - py{27,34,35,36}-pytest{34,35,36} + py{27,34,35,36}-pytest{30,31,32,33,36} py{27,36}-pytest36-pexpect py{27,36}-pytest{master,features} @@ -14,8 +14,10 @@ deps = pycmd # to avoid .eggs setuptools_scm - pytest34: pytest~=3.4.0 - pytest35: pytest~=3.5.0 + pytest30: pytest~=3.0.5 + pytest31: pytest~=3.1.0 + pytest32: pytest~=3.2.0 + pytest33: pytest~=3.3.0 pytest36: pytest~=3.6.0 pytestmaster: git+https://github.com/pytest-dev/pytest.git@master pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features