From b8154cf6558239c1902f9aefedfb552a5119aefb Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Fri, 27 Jul 2018 17:02:20 -0300 Subject: [PATCH 1/5] Revert "Drop support to old pytest versions (<3.4)" This reverts commit b5abe791ad195c6d915505cf869fdf8922376f12. --- .travis.yml | 7 ++++--- appveyor.yml | 17 +++++++++-------- setup.py | 2 +- tox.ini | 11 ++++++----- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 080d7502..4e8d9873 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 c42501d1..2aa53fa9 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 f8c3f98f..becb323a 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 48b9e83a..8bda1c23 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 From b9d91e913eb574455ba2d13b6c11f365df0498cb Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Fri, 27 Jul 2018 17:06:11 -0300 Subject: [PATCH 2/5] Add changelog entry for #321 --- changelog/321.bugfix.rst | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/321.bugfix.rst diff --git a/changelog/321.bugfix.rst b/changelog/321.bugfix.rst new file mode 100644 index 00000000..e4be5457 --- /dev/null +++ b/changelog/321.bugfix.rst @@ -0,0 +1,5 @@ +Revert change that dropped support for ``pytest<3.4``. + +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. From dba68518fc7f7660b94ddbc42c982a62574ec5c4 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Fri, 27 Jul 2018 17:07:40 -0300 Subject: [PATCH 3/5] Prepare release 1.22.5 --- CHANGELOG.rst | 13 +++++++++++++ changelog/321.bugfix.rst | 5 ----- 2 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 changelog/321.bugfix.rst diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 35199550..76bf02cb 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``. + + 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/changelog/321.bugfix.rst b/changelog/321.bugfix.rst deleted file mode 100644 index e4be5457..00000000 --- a/changelog/321.bugfix.rst +++ /dev/null @@ -1,5 +0,0 @@ -Revert change that dropped support for ``pytest<3.4``. - -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. From beb92732edac3d03347ea725746aa79ebf32250d Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Fri, 27 Jul 2018 17:20:50 -0300 Subject: [PATCH 4/5] Include pytest 3.6 into the build matrix --- .travis.yml | 1 + appveyor.yml | 5 +++-- tox.ini | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e8d9873..f9123c5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ env: - TOXENV=py-pytest31 - TOXENV=py-pytest32 - TOXENV=py-pytest33 +- TOXENV=py-pytest36 install: pip install tox setuptools_scm script: tox diff --git a/appveyor.yml b/appveyor.yml index 2aa53fa9..96721d0a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,18 +5,19 @@ environment: - TOXENV: "py34-pytest33" - TOXENV: "py35-pytest33" - TOXENV: "py36-pytest33" + - TOXENV: "py36-pytest36" - TOXENV: "py27-pytest33-pexpect" - TOXENV: "py36-pytest33-pexpect" - TOXENV: "flakes" - TOXENV: "readme" install: - - C:\Python35\python -m pip install -U tox setuptools_scm pip + - C:\Python36\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:\Python35\python -m tox + - C:\Python36\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/tox.ini b/tox.ini index 8bda1c23..93995134 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{30,31,32,33} - py{27,36}-pytest{30,31,32,33}-pexpect + py{27,34,35,36}-pytest{30,31,32,33,36} + py{27,36}-pytest{30,36}-pexpect py{27,36}-pytest{master,features} flakes readme @@ -19,6 +19,7 @@ deps = 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 pexpect: pexpect From f92242652d17f382de96f78c3a33bdafdda72467 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sat, 28 Jul 2018 09:06:04 -0300 Subject: [PATCH 5/5] Include six as dependency --- CHANGELOG.rst | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 76bf02cb..bd08eb60 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,7 +4,7 @@ pytest-xdist 1.22.5 (2018-07-27) Bug Fixes --------- -- `#321 `_: Revert change that dropped support for ``pytest<3.4``. +- `#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 diff --git a/setup.py b/setup.py index becb323a..61d9b1ba 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -install_requires = ['execnet>=1.1', 'pytest>=3.0.0', 'pytest-forked'] +install_requires = ['execnet>=1.1', 'pytest>=3.0.0', 'pytest-forked', "six"] setup(