Skip to content

enable pytest 5.x and pytest-xdist >= 1.28 #1311

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.

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 1 commit into from
Jul 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ MODULE=cwltool
# `[[` conditional expressions.
PYSOURCES=$(wildcard ${MODULE}/**.py tests/*.py) setup.py
DEVPKGS=diff_cover black pylint coverage pep257 pydocstyle flake8 mypy\
pytest-xdist==1.27.0 isort wheel -rtest-requirements.txt
pytest-xdist isort wheel -rtest-requirements.txt
DEBDEVPKGS=pep8 python-autopep8 pylint python-coverage pydocstyle sloccount \
python-flake8 python-mock shellcheck
VERSION=3.0.$(shell TZ=UTC git log --first-parent --max-count=1 \
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ install:
- ps: 'Install-Product node 0.12 x64'
- "set PATH=%PYTHON%\\Scripts;%PATH%"
- "%PYTHON%\\python.exe -m pip install -U pip setuptools^>=20.3 wheel"
- "%PYTHON%\\python.exe -m pip install -U codecov -rtest-requirements.txt pytest-xdist==1.27 "
- "%PYTHON%\\python.exe -m pip install -U codecov -rtest-requirements.txt pytest-xdist"
# Note the use of a `^` to escape the `>`

build_script:
Expand Down
2 changes: 1 addition & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pytest < 4.3.0
pytest < 6
mock >= 2.0.0
pytest-mock >= 1.10.0
pytest-cov
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ passenv =
deps =
-rrequirements.txt
py{35,36,37,38}-unit: codecov
py{35,36,37,38}-unit: pytest-xdist<1.28.0
py{35,36,37,38}-unit: pytest-xdist
py{35,36,37,38}-unit: pytest-cov
py{35,36,37,38}-{unit,mypy}: -rtest-requirements.txt
py{35,36,37,38}-unit: galaxy-tool-util
Expand Down