diff --git a/mypy-requirements.txt b/mypy-requirements.txt index d89b7d1b8..c2db73673 100644 --- a/mypy-requirements.txt +++ b/mypy-requirements.txt @@ -5,5 +5,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,<23.3 -galaxy-util<23.2 +galaxy-tool-util>=22.1.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5,<24.1 +galaxy-util<24.1 diff --git a/setup.py b/setup.py index 63cb6ede3..ddd5ed454 100644 --- a/setup.py +++ b/setup.py @@ -141,8 +141,8 @@ ], extras_require={ "deps": [ - "galaxy-tool-util>=22.1.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5,<23.3", - "galaxy-util <23.2", + "galaxy-tool-util>=22.1.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5,<24.1", + "galaxy-util <24.1", ], }, python_requires=">=3.8, <4", diff --git a/test-requirements.txt b/test-requirements.txt index 0085cde01..d7901c3a5 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,5 +9,5 @@ pytest-mock>=1.10.0 pytest-cov arcp>=0.2.0 -rrequirements.txt -galaxy-tool-util>=22.1.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5,<23.3 -galaxy-util<23.2 +galaxy-tool-util>=22.1.2,!=23.0.1,!=23.0.2,!=23.0.3,!=23.0.4,!=23.0.5,<24.1 +galaxy-util<24.1 diff --git a/tests/test_dependencies.py b/tests/test_dependencies.py index 2acbf9f48..ae18a41ae 100644 --- a/tests/test_dependencies.py +++ b/tests/test_dependencies.py @@ -49,12 +49,10 @@ def test_biocontainers(tmp_path: Path) -> None: def test_biocontainers_resolution(tmp_path: Path) -> None: """Confirm expected container name for --beta-use-biocontainers.""" tool = load_tool(get_data("tests/seqtk_seq.cwl"), LoadingContext()) - assert ( - get_container_from_software_requirements( - True, tool, container_image_cache_path=str(tmp_path) - ) - == "quay.io/biocontainers/seqtk:1.4--he4a0461_1" + container = get_container_from_software_requirements( + True, tool, container_image_cache_path=str(tmp_path) ) + assert container is not None and container.startswith("quay.io/biocontainers/seqtk:1.4--") @pytest.fixture(scope="session")