Skip to content

Commit 8493962

Browse files
authored
enable pytest 5.x and pytest-xdist >= 1.28 (#1311)
1 parent 1cf9d36 commit 8493962

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ MODULE=cwltool
2626
# `[[` conditional expressions.
2727
PYSOURCES=$(wildcard ${MODULE}/**.py tests/*.py) setup.py
2828
DEVPKGS=diff_cover black pylint coverage pep257 pydocstyle flake8 mypy\
29-
pytest-xdist==1.27.0 isort wheel -rtest-requirements.txt
29+
pytest-xdist isort wheel -rtest-requirements.txt
3030
DEBDEVPKGS=pep8 python-autopep8 pylint python-coverage pydocstyle sloccount \
3131
python-flake8 python-mock shellcheck
3232
VERSION=3.0.$(shell TZ=UTC git log --first-parent --max-count=1 \

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ install:
2828
- ps: 'Install-Product node 0.12 x64'
2929
- "set PATH=%PYTHON%\\Scripts;%PATH%"
3030
- "%PYTHON%\\python.exe -m pip install -U pip setuptools^>=20.3 wheel"
31-
- "%PYTHON%\\python.exe -m pip install -U codecov -rtest-requirements.txt pytest-xdist==1.27 "
31+
- "%PYTHON%\\python.exe -m pip install -U codecov -rtest-requirements.txt pytest-xdist"
3232
# Note the use of a `^` to escape the `>`
3333

3434
build_script:

test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pytest < 4.3.0
1+
pytest < 6
22
mock >= 2.0.0
33
pytest-mock >= 1.10.0
44
pytest-cov

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ passenv =
3232
deps =
3333
-rrequirements.txt
3434
py{35,36,37,38}-unit: codecov
35-
py{35,36,37,38}-unit: pytest-xdist<1.28.0
35+
py{35,36,37,38}-unit: pytest-xdist
3636
py{35,36,37,38}-unit: pytest-cov
3737
py{35,36,37,38}-{unit,mypy}: -rtest-requirements.txt
3838
py{35,36,37,38}-unit: galaxy-tool-util

0 commit comments

Comments
 (0)