Skip to content

Commit 25d8351

Browse files
committed
Merge branch 'dev-1.5' into drop-python-3-10
2 parents e931d2e + 27f61a4 commit 25d8351

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
* Dependencies:
1919
* Add `fractal-task-tools==0.0.10` dependency (\#923).
2020

21+
22+
# Unreleased
23+
24+
* Testing:
25+
* Fix links to ome/ngff specs (\#930).
26+
2127
# 1.4.3
2228

2329
* Tasks:

tests/tasks/_validation.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,15 @@
1919

2020

2121
def validate_schema(*, path: str, type: str):
22-
22+
if __OME_NGFF_VERSION__ != "0.4":
23+
raise ValueError(
24+
"This test is only valid for OME-NGFF version 0.4, "
25+
"please update the test."
26+
)
2327
file_path = pooch.retrieve(
2428
url=(
25-
"https://raw.githubusercontent.com/ome/ngff/main/"
26-
f"{__OME_NGFF_VERSION__}/schemas/{type}.schema"
29+
"https://raw.githubusercontent.com/ome/ngff/"
30+
f"7ac3430c74a66e5bcf53e41c429143172d68c0a4/schemas/{type}.schema"
2731
),
2832
known_hash=None,
2933
)

tests/test_unit_channels.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,16 @@ def test_get_channel_from_list(testdata_path: Path):
126126

127127
@pytest.fixture(scope="session")
128128
def omero_channel_schema():
129+
130+
if __OME_NGFF_VERSION__ != "0.4":
131+
raise ValueError(
132+
"This test is only valid for OME-NGFF version 0.4, "
133+
"please update the test."
134+
)
129135
file_path = pooch.retrieve(
130136
url=(
131-
"https://raw.githubusercontent.com/ome/ngff/main/"
132-
f"{__OME_NGFF_VERSION__}/schemas/image.schema"
137+
"https://raw.githubusercontent.com/ome/ngff/"
138+
"7ac3430c74a66e5bcf53e41c429143172d68c0a4/schemas/image.schema"
133139
),
134140
known_hash=None,
135141
)

0 commit comments

Comments
 (0)