From 81128faa478d3b2e2d4b6f55b75aab735815e157 Mon Sep 17 00:00:00 2001 From: lorenzocerrone Date: Thu, 3 Apr 2025 10:46:37 +0200 Subject: [PATCH 1/5] fix #929 --- tests/tasks/_validation.py | 8 +++++--- tests/test_unit_channels.py | 8 ++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/tasks/_validation.py b/tests/tasks/_validation.py index 00ff4028b..a30ba06a2 100644 --- a/tests/tasks/_validation.py +++ b/tests/tasks/_validation.py @@ -19,11 +19,13 @@ def validate_schema(*, path: str, type: str): - + if __OME_NGFF_VERSION__ != "0.4": + raise ValueError( + "This test is only valid for OME-NGFF version 0.4, please update the test." + ) file_path = pooch.retrieve( url=( - "https://raw.githubusercontent.com/ome/ngff/main/" - f"{__OME_NGFF_VERSION__}/schemas/{type}.schema" + f"https://raw.githubusercontent.com/ome/ngff/7ac3430c74a66e5bcf53e41c429143172d68c0a4/schemas/{type}.schema" ), known_hash=None, ) diff --git a/tests/test_unit_channels.py b/tests/test_unit_channels.py index 76fe38dcc..65d368b22 100644 --- a/tests/test_unit_channels.py +++ b/tests/test_unit_channels.py @@ -126,10 +126,14 @@ def test_get_channel_from_list(testdata_path: Path): @pytest.fixture(scope="session") def omero_channel_schema(): + + if __OME_NGFF_VERSION__ != "0.4": + raise ValueError( + "This test is only valid for OME-NGFF version 0.4, please update the test." + ) file_path = pooch.retrieve( url=( - "https://raw.githubusercontent.com/ome/ngff/main/" - f"{__OME_NGFF_VERSION__}/schemas/image.schema" + "https://raw.githubusercontent.com/ome/ngff/7ac3430c74a66e5bcf53e41c429143172d68c0a4/schemas/image.schema" ), known_hash=None, ) From 31d08764928a30a20be13e8e510ddd36cf4eae61 Mon Sep 17 00:00:00 2001 From: lorenzocerrone Date: Thu, 3 Apr 2025 10:52:30 +0200 Subject: [PATCH 2/5] run pre-commit --- tests/tasks/_validation.py | 6 ++++-- tests/test_unit_channels.py | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/tasks/_validation.py b/tests/tasks/_validation.py index a30ba06a2..3c008bb12 100644 --- a/tests/tasks/_validation.py +++ b/tests/tasks/_validation.py @@ -21,11 +21,13 @@ def validate_schema(*, path: str, type: str): if __OME_NGFF_VERSION__ != "0.4": raise ValueError( - "This test is only valid for OME-NGFF version 0.4, please update the test." + "This test is only valid for OME-NGFF version 0.4, " + "please update the test." ) file_path = pooch.retrieve( url=( - f"https://raw.githubusercontent.com/ome/ngff/7ac3430c74a66e5bcf53e41c429143172d68c0a4/schemas/{type}.schema" + "https://raw.githubusercontent.com/ome/ngff/" + f"7ac3430c74a66e5bcf53e41c429143172d68c0a4/schemas/{type}.schema" ), known_hash=None, ) diff --git a/tests/test_unit_channels.py b/tests/test_unit_channels.py index 65d368b22..92ad69b7f 100644 --- a/tests/test_unit_channels.py +++ b/tests/test_unit_channels.py @@ -126,14 +126,16 @@ def test_get_channel_from_list(testdata_path: Path): @pytest.fixture(scope="session") def omero_channel_schema(): - + if __OME_NGFF_VERSION__ != "0.4": raise ValueError( - "This test is only valid for OME-NGFF version 0.4, please update the test." + "This test is only valid for OME-NGFF version 0.4, " + "please update the test." ) file_path = pooch.retrieve( url=( - "https://raw.githubusercontent.com/ome/ngff/7ac3430c74a66e5bcf53e41c429143172d68c0a4/schemas/image.schema" + "https://raw.githubusercontent.com/ome/ngff/" + "7ac3430c74a66e5bcf53e41c429143172d68c0a4/schemas/image.schema" ), known_hash=None, ) From 9f8ef21ac9666a73fdeaee2b10e7339fb1d413a4 Mon Sep 17 00:00:00 2001 From: lorenzocerrone Date: Thu, 3 Apr 2025 10:57:14 +0200 Subject: [PATCH 3/5] update change log --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2d837b0a..86ef1f64d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ **Note**: Numbers like (\#123) point to closed Pull Requests on the fractal-tasks-core repository. +# 1.4.4 + +* Testing: + * Fix links to ome/ngff specs + # 1.4.3 * Tasks: From 60e2a8b3e23cb87c0d5ac78bb181cd35dfa3c557 Mon Sep 17 00:00:00 2001 From: Tommaso Comparin <3862206+tcompa@users.noreply.github.com> Date: Thu, 3 Apr 2025 11:05:25 +0200 Subject: [PATCH 4/5] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86ef1f64d..7f5fdee03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ # 1.4.4 * Testing: - * Fix links to ome/ngff specs + * Fix links to ome/ngff specs (\#930). # 1.4.3 From cccfa7520df60853af14b2427e2fa7c416aacaa3 Mon Sep 17 00:00:00 2001 From: Tommaso Comparin <3862206+tcompa@users.noreply.github.com> Date: Thu, 3 Apr 2025 11:06:08 +0200 Subject: [PATCH 5/5] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f5fdee03..7d165a1bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ **Note**: Numbers like (\#123) point to closed Pull Requests on the fractal-tasks-core repository. -# 1.4.4 +# Unreleased * Testing: * Fix links to ome/ngff specs (\#930).