diff --git a/mypy-requirements.txt b/mypy-requirements.txt index b9352492c..3523889d6 100644 --- a/mypy-requirements.txt +++ b/mypy-requirements.txt @@ -6,5 +6,5 @@ types-requests types-setuptools types-psutil types-mock -galaxy-tool-util>=22.1.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5,<24.3 -galaxy-util<24.3 +galaxy-tool-util>=22.1.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5,<25.1 +galaxy-util<25.1 diff --git a/setup.py b/setup.py index d37daaf6c..8f8098f0a 100644 --- a/setup.py +++ b/setup.py @@ -165,8 +165,9 @@ def _find_package_data(base: str, globs: list[str], root: str = "cwltool") -> li ], extras_require={ "deps": [ - "galaxy-tool-util>=22.1.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5,<24.3", - "galaxy-util <24.3", + "galaxy-tool-util>=22.1.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5,<25.1", + "galaxy-util <25.1", + "pillow", # workaround for https://github.com/galaxyproject/galaxy/pull/20525 ], }, python_requires=">=3.9, <3.14", diff --git a/test-requirements.txt b/test-requirements.txt index 7ca4d45be..42565f630 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,5 +9,5 @@ pytest-mock>=1.10.0 pytest-cov arcp>=0.2.0 -r requirements.txt -galaxy-tool-util>=22.1.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5,<24.3 -galaxy-util<24.3 +galaxy-tool-util>=22.1.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5,<25.1 +galaxy-util<25.1