Skip to content
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 lint-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
flake8-bugbear
flake8-bugbear < 23.6
black ~= 23.3
codespell
2 changes: 1 addition & 1 deletion mypy-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mypy==1.2.0 # also update pyproject.toml
ruamel.yaml>=0.16.0,<0.17.22
ruamel.yaml>=0.16.0,<0.17.27
schema-salad>=8.4,<9
cwl-utils >=0.22
types-requests
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ requires = [
"types-pkg_resources",
"types-requests",
"types-psutil",
"ruamel.yaml>=0.16.0,<0.17.22",
"ruamel.yaml>=0.16.0,<0.17.27",
"schema-salad>=8.2.20211104054942,<9",
"cwl-utils >=0.19",
'toml',
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
requests>=2.6.1
ruamel.yaml>=0.16.0,<0.17.22;python_version>='3.10'
ruamel.yaml>=0.15,<0.17.22
ruamel.yaml>=0.16.0,<0.17.27;python_version>='3.10'
ruamel.yaml>=0.15,<0.17.27
rdflib>=4.2.2,<6.4
rdflib>= 4.2.2, < 6.0.0;python_version<='3.6'
shellescape>=3.4.1,<3.9
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"setuptools",
"requests >= 2.6.1", # >= 2.6.1 to workaround
# https://github.com/ionrock/cachecontrol/issues/137
"ruamel.yaml >= 0.15, < 0.17.22",
"ruamel.yaml >= 0.15, < 0.17.27",
"rdflib >= 4.2.2, < 6.4.0",
"rdflib >= 4.2.2, < 6.0.0;python_version<='3.6'",
"shellescape >= 3.4.1, < 3.9",
Expand Down
3 changes: 1 addition & 2 deletions tests/test_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -816,8 +816,7 @@ def test_lifting() -> None:
# fails if the step 'out' doesn't match.
factory = cwltool.factory.Factory()
with pytest.raises(ValidationException):
echo = factory.make(get_data("tests/test_bad_outputs_wf.cwl"))
assert echo(inp="foo") == {"out": "foo\n"}
factory.make(get_data("tests/test_bad_outputs_wf.cwl"))


def test_malformed_outputs() -> None:
Expand Down
8 changes: 4 additions & 4 deletions tests/test_mpi.py
Original file line number Diff line number Diff line change
Expand Up @@ -347,15 +347,15 @@ def test_docker_required(schema_ext11: Names) -> None:

def test_docker_mpi_both_required(schema_ext11: Names) -> None:
# Both required - error
lc, rc, tool = mk_tool(schema_ext11, [], reqs=[mpiReq, containerReq])
clt = CommandLineTool(tool, lc)
with pytest.raises(cwltool.errors.UnsupportedRequirement):
lc, rc, tool = mk_tool(schema_ext11, [], reqs=[mpiReq, containerReq])
clt = CommandLineTool(tool, lc)
clt.make_job_runner(rc)


def test_docker_mpi_both_hinted(schema_ext11: Names) -> None:
# Both hinted - error
lc, rc, tool = mk_tool(schema_ext11, [], hints=[mpiReq, containerReq])
clt = CommandLineTool(tool, lc)
with pytest.raises(cwltool.errors.UnsupportedRequirement):
lc, rc, tool = mk_tool(schema_ext11, [], hints=[mpiReq, containerReq])
clt = CommandLineTool(tool, lc)
clt.make_job_runner(rc)