Skip to content

Commit 9144a78

Browse files
dependabot[bot]mr-c
andcommitted
Update galaxy-tool-util requirement from <23,>=22.1.2 to >=22.1.2,<24
Updates the requirements on [galaxy-tool-util](https://github.com/galaxyproject/galaxy) to permit the latest version. - [Release notes](https://github.com/galaxyproject/galaxy/releases) - [Commits](galaxyproject/galaxy@galaxy-tool-util-22.1.3...v23.0.1) --- updated-dependencies: - dependency-name: galaxy-tool-util dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Michael R. Crusoe <[email protected]>
1 parent bab56aa commit 9144a78

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

cwltool/software_requirements.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def get_container_from_software_requirements(
155155
[DOCKER_CONTAINER_TYPE], tool_info
156156
)
157157
if container_description:
158-
return cast(Optional[str], container_description.identifier)
158+
return container_description.identifier
159159

160160
return None
161161

mypy-requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ types-requests
55
types-setuptools
66
types-psutil
77
types-mock
8+
galaxy-tool-util>=22.1.2,<24
9+
galaxy-util<24

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ requires = [
77
"importlib_resources>=1.4", # equivalent to Python 3.9
88
"ruamel.yaml>=0.16.0,<0.18",
99
"schema-salad>=8.4.20230426093816,<9",
10-
"packaging<22",
1110
"cwl-utils>=0.19",
11+
"galaxy-tool-util >= 22.1.2, < 24",
1212
"toml",
1313
"argcomplete>=1.12.0",
1414
]

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
"cwl-utils >= 0.22",
128128
],
129129
extras_require={
130-
"deps": ["galaxy-tool-util >= 22.1.2, <23", "galaxy-util <23"],
130+
"deps": ["galaxy-tool-util >= 22.1.2, <24", "galaxy-util <24"],
131131
},
132132
python_requires=">=3.8, <4",
133133
setup_requires=PYTEST_RUNNER,

test-requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ pytest-mock>=1.10.0
77
pytest-cov
88
arcp>=0.2.0
99
-rrequirements.txt
10-
galaxy-tool-util>=22.1.2,<23
11-
galaxy-util<23
10+
galaxy-tool-util>=22.1.2,<24
11+
galaxy-util<24

tests/test_dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
deps: Optional[ModuleType] = None
1919
try:
20-
from galaxy.tool_util import deps # type: ignore[no-redef]
20+
from galaxy.tool_util import deps
2121
except ImportError:
2222
pass
2323

0 commit comments

Comments
 (0)