Skip to content

ci: xdist with pluggymaster #4836

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

Merged
merged 3 commits into from
Feb 26, 2019
Merged

ci: xdist with pluggymaster #4836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32b85e4
ci: Travis: use xdist with pluggymaster jobs
blueyed Feb 26, 2019
f85f36e
AppVeyor: drop pluggymaster
blueyed Feb 13, 2019
4eb40ef
ci: azure: use xdist with pluggymaster
blueyed Feb 26, 2019
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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ env:
# Specialized factors for py27.
- TOXENV=py27-nobyte
- TOXENV=py27-xdist
- TOXENV=py27-pluggymaster
- TOXENV=py27-pluggymaster-xdist
# Specialized factors for py37.
- TOXENV=py37-pexpect,py37-trial,py37-numpy
- TOXENV=py37-pluggymaster
- TOXENV=py37-pluggymaster-xdist
- TOXENV=py37-freeze PYTEST_NO_COVERAGE=1

matrix:
Expand Down
3 changes: 1 addition & 2 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@ environment:
- TOXENV: "py34-xdist"
- TOXENV: "py35-xdist"
- TOXENV: "py36-xdist"
# NOTE: pypy-xdist is buggy currently (https://github.com/pytest-dev/pytest-xdist/issues/142).
- TOXENV: "pypy"
PYTEST_NO_COVERAGE: "1"
# Specialized factors for py27.
- TOXENV: "py27-trial,py27-numpy,py27-nobyte"
- TOXENV: "py27-pluggymaster"
Copy link
Member

@nicoddemus nicoddemus Feb 26, 2019

Choose a reason for hiding this comment

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

I would prefer not to touch this; when we adopt Azure for good, we will disable AppVeyor entirely, so it doesn't make much sense to change things mid way now.

Copy link
Contributor Author

@blueyed blueyed Feb 26, 2019

Choose a reason for hiding this comment

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

This is in features already: dc8c270

Copy link
Member

@nicoddemus nicoddemus Feb 26, 2019

Choose a reason for hiding this comment

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

Oh nevermind then! 😋

Besides #4807, we could adopt Azure as our official Windows build right away. I will try to get to it later.

# Specialized factors for py37.
- TOXENV: "py37-trial,py37-numpy"
- TOXENV: "py37-pluggymaster"
- TOXENV: "py37-freeze"
PYTEST_NO_COVERAGE: "1"

Expand Down
8 changes: 4 additions & 4 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
python.version: '2.7'
tox.env: 'py27-trial'
python.needs_vc: True
py27-pluggymaster:
py27-pluggymaster-xdist:
python.version: '2.7'
tox.env: 'pluggymaster'
tox.env: 'py27-pluggymaster-xdist'
pypy:
python.version: 'pypy'
tox.env: 'pypy'
Expand All @@ -55,9 +55,9 @@ jobs:
py37-trial/numpy:
python.version: '3.7'
tox.env: 'py37-trial,py37-numpy'
py37-pluggymaster:
py37-pluggymaster-xdist:
python.version: '3.7'
tox.env: 'py37-pluggymaster'
tox.env: 'py37-pluggymaster-xdist'
maxParallel: 10

steps:
Expand Down