Skip to content

Commit f78ebb3

Browse files
authored
Merge branch 'common-workflow-language:main' into env_var_caching
2 parents cd8ddf2 + 1b56338 commit f78ebb3

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/ci-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989

9090
tox-style:
9191
name: Linters
92-
runs-on: ubuntu-20.04
92+
runs-on: ubuntu-24.04
9393

9494
strategy:
9595
matrix:

mypy-requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ types-requests
66
types-setuptools
77
types-psutil
88
types-mock
9-
galaxy-tool-util>=22.1.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5,<24.2
10-
galaxy-util<24.2
9+
galaxy-tool-util>=22.1.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5,<24.3
10+
galaxy-util<24.3

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ def _find_package_data(base: str, globs: list[str], root: str = "cwltool") -> li
164164
],
165165
extras_require={
166166
"deps": [
167-
"galaxy-tool-util>=22.1.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5,<24.2",
168-
"galaxy-util <24.2",
167+
"galaxy-tool-util>=22.1.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5,<24.3",
168+
"galaxy-util <24.3",
169169
],
170170
},
171171
python_requires=">=3.9, <3.14",

test-requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ pytest-mock>=1.10.0
99
pytest-cov
1010
arcp>=0.2.0
1111
-r requirements.txt
12-
galaxy-tool-util>=22.1.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5,<24.2
13-
galaxy-util<24.2
12+
galaxy-tool-util>=22.1.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5,<24.3
13+
galaxy-util<24.3

0 commit comments

Comments
 (0)