Merge pull request #626 from bioimage-io/FynnBe-patch-1

switch back to rdf.yaml

README.md

@@ -123,6 +123,7 @@ To keep the bioimageio.spec Python package version in sync with the (model) desc
 
 #### bioimageio.spec 0.5.3.3 (not yet released)
 
+* prefer `rdf.yaml` over `bioimageio.yaml` (name `bioimageio.yaml` file `rdf.yaml` file when packaging, look for `rdf.yaml` first, etc.)
 * enforce: (generic 0.3/model 0.5 spec) documentation source file encoding has to be UTF-8.
 * bugfix: allow optional pre- and postprocessing to be missing in an RDF (before it required an empty dict).
 

bioimageio/spec/_internal/io_basics.py

@@ -11,8 +11,8 @@
 AbsoluteDirectory = Annotated[DirectoryPath, Predicate(Path.is_absolute)]
 AbsoluteFilePath = Annotated[FilePath, Predicate(Path.is_absolute)]
 
-BIOIMAGEIO_YAML = "bioimageio.yaml"
-ALTERNATIVE_BIOIMAGEIO_YAML_NAMES = ("rdf.yaml", "model.yaml")
+BIOIMAGEIO_YAML = "rdf.yaml"
+ALTERNATIVE_BIOIMAGEIO_YAML_NAMES = ("bioimageio.yaml", "model.yaml")
 ALL_BIOIMAGEIO_YAML_NAMES = (BIOIMAGEIO_YAML,) + ALTERNATIVE_BIOIMAGEIO_YAML_NAMES
 
 

tests/test_internal/test_io.py

@@ -80,7 +80,7 @@ def test_known_files(tmp_path: Path):
     _ = src.write_text("lala")
     sha = get_sha256(src)
 
-    with ValidationContext(root=tmp_path):
+    with ValidationContext(root=tmp_path, perform_io_checks=True):
         # set sha on loading
         file_descr = FileDescr(source=file_name)  # pyright: ignore[reportArgumentType]
         assert file_descr.sha256 == sha
@@ -92,7 +92,7 @@ def test_known_files(tmp_path: Path):
         assert file_descr.sha256 == sha
 
     # give known files to bypass file io
-    with ValidationContext(known_files={file_name: sha}):
+    with ValidationContext(known_files={file_name: sha}, perform_io_checks=True):
         # set sha on loading
         file_descr = FileDescr(source=file_name)  # pyright: ignore[reportArgumentType]
         assert file_descr.sha256 == sha