Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Galaxy-* 24.0.0 #1990

Merged
merged 3 commits into from
Apr 3, 2024
Merged

Galaxy-* 24.0.0 #1990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a70299
Update galaxy-tool-util requirement
dependabot[bot] Apr 3, 2024
0e06938
Update galaxy-util requirement from <23.2 to <24.1
dependabot[bot] Apr 3, 2024
7c801fe
dependencies: make resolution test more flexible
mr-c Apr 3, 2024
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
4 changes: 2 additions & 2 deletions mypy-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 3 additions & 5 deletions tests/test_dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading