Skip to content

Commit 2a564ac

Browse files
authored
Merge branch 'master' into docker_reminder
2 parents 4be60cf + 3ed10d0 commit 2a564ac

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ MODULE=cwltool
2727
# `[[` conditional expressions.
2828
PYSOURCES=$(wildcard ${MODULE}/**.py tests/*.py) setup.py
2929
DEVPKGS=pycodestyle diff_cover autopep8 pylint coverage pydocstyle flake8 \
30-
pytest pytest-xdist isort wheel
30+
pytest-xdist isort wheel -rtest-requirements.txt
3131
DEBDEVPKGS=pep8 python-autopep8 pylint python-coverage pydocstyle sloccount \
3232
python-flake8 python-mock shellcheck
3333
VERSION=1.0.$(shell TZ=UTC git log --first-parent --max-count=1 \
@@ -51,7 +51,7 @@ help: Makefile
5151

5252
## install-dep : install most of the development dependencies via pip
5353
install-dep:
54-
pip install --upgrade $(DEVPKGS) -rtest-requirements.txt
54+
pip install --upgrade $(DEVPKGS)
5555

5656
## install-deb-dep: install most of the dev dependencies via apt-get
5757
install-deb-dep:

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ install:
3232
- ps: 'Install-Product node 0.12 x64'
3333
- "set PATH=%PYTHON%\\Scripts;%PATH%"
3434
- "%PYTHON%\\python.exe -m pip install -U pip setuptools^>=20.3 wheel"
35-
- "%PYTHON%\\python.exe -m pip install -U codecov pytest-xdist pytest-cov galaxy-lib -rtest-requirements.txt"
35+
- "%PYTHON%\\python.exe -m pip install -U codecov -rtest-requirements.txt pytest-xdist "
3636
# Note the use of a `^` to escape the `>`
3737

3838
build_script:
3939
- "%PYTHON%\\python.exe -m pip install -rrequirements.txt"
40-
- "%PYTHON%\\python.exe -m pip install -e ."
40+
- "%PYTHON%\\python.exe -m pip install -e .[deps]"
4141

4242
test_script:
4343
- |

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@
6666
':os.name=="posix" and python_version<"3.5"': ['subprocess32 >= 3.5.0'],
6767
':python_version<"3"': ['pathlib2 == 2.3.2'],
6868
':python_version<"3.6"': ['typing >= 3.5.3'],
69-
'deps': ["galaxy-lib >= 17.09.9"]
69+
'deps': ["galaxy-lib >= 17.09.9, <= 18.9.2 "]
7070
},
7171
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4',
7272
setup_requires=PYTEST_RUNNER,
7373
test_suite='tests',
74-
tests_require=['pytest', 'mock >= 2.0.0', 'pytest-mock >= 1.10.0',
74+
tests_require=['pytest < 4.3.0', 'mock >= 2.0.0', 'pytest-mock >= 1.10.0',
7575
'arcp >= 0.2.0', 'rdflib-jsonld >= 0.4.0'],
7676
entry_points={
7777
'console_scripts': ["cwltool=cwltool.main:run"]

test-requirements.txt

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

0 commit comments

Comments
 (0)