Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert dropped support to old pytest versions #321

Merged
merged 6 commits into from
Jul 28, 2018
Merged

Revert dropped support to old pytest versions #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b8154cf
Revert "Drop support to old pytest versions (<3.4)"
nicoddemus Jul 27, 2018
b9d91e9
Add changelog entry for #321
nicoddemus Jul 27, 2018
dba6851
Prepare release 1.22.5
nicoddemus Jul 27, 2018
beb9273
Include pytest 3.6 into the build matrix
nicoddemus Jul 27, 2018
f922426
Include six as dependency
nicoddemus Jul 28, 2018
a72f253
Merge remote-tracking branch 'upstream/master' into release-1.22.5
nicoddemus Jul 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
pytest-xdist 1.22.5 (2018-07-27)
================================

Bug Fixes
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there seems to be a B missing

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i suggest to do a minor release adding six

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, done.

About the missing B, it is some bug on GH's diff, the file is fine.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The missing B is a problem with "Refined GitHub": refined-github/refined-github#1444

---------

- `#321 <https://github.com/pytest-dev/pytest-xdist/issues/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)
================================

Expand Down
12 changes: 7 additions & 5 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
8 changes: 5 additions & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand All @@ -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
Expand Down