diff --git a/README.md b/README.md index b171d33de..ff860827f 100644 --- a/README.md +++ b/README.md @@ -85,6 +85,10 @@ Made with [contrib.rocks](https://contrib.rocks). ### bioimageio.spec Python package +#### bioimageio.spec 0.5.0post1 + +* fix `_internal.io_utils.identify_bioimageio_yaml_file()` + #### bioimageio.spec 0.5.0 * new description formats: [generic 0.3, application 0.3, collection 0.3, dataset 0.3, notebook 0.3](generic-030--application-030--collection-030--dataset-030--notebook-030) and [model 0.5](model-050). diff --git a/bioimageio/spec/VERSION b/bioimageio/spec/VERSION index 8fd887d4d..65ffcdda8 100644 --- a/bioimageio/spec/VERSION +++ b/bioimageio/spec/VERSION @@ -1,3 +1,3 @@ { - "version": "0.5.0" + "version": "0.5.0post1" } diff --git a/bioimageio/spec/_internal/io_utils.py b/bioimageio/spec/_internal/io_utils.py index 18d7cd9da..63e8e1940 100644 --- a/bioimageio/spec/_internal/io_utils.py +++ b/bioimageio/spec/_internal/io_utils.py @@ -13,6 +13,7 @@ from typing_extensions import Unpack from .io import ( + ALL_BIOIMAGEIO_YAML_NAMES, BIOIMAGEIO_YAML, BioimageioYamlContent, FileDescr, @@ -92,15 +93,15 @@ def open_bioimageio_yaml( def identify_bioimageio_yaml_file(file_names: Iterable[FileName]) -> FileName: file_names = sorted(file_names) - for bioimageio_name in (BIOIMAGEIO_YAML,) + ALTERNATIVE_BIOIMAGEIO_YAML_NAMES: + for bioimageio_name in ALL_BIOIMAGEIO_YAML_NAMES: for fname in file_names: - if fname == bioimageio_name or fname.endswith(f".{fname}"): + if fname == bioimageio_name or fname.endswith(f".{bioimageio_name}"): return fname raise ValueError( f"No {BIOIMAGEIO_YAML} found in {file_names}. (Looking for '{BIOIMAGEIO_YAML}'" + " or or any of the alterntive file names:" - + f" {ALTERNATIVE_BIOIMAGEIO_YAML_NAMES},of any file with an extension of" + + f" {ALTERNATIVE_BIOIMAGEIO_YAML_NAMES}, or any file with an extension of" + f" those, e.g. 'anything.{BIOIMAGEIO_YAML}')." ) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 9b4f6a6b2..303b45ce9 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -35,7 +35,6 @@ test: {% for dep in setup_py_data['extras_require']['dev'] %} - {{ dep.replace('torch', 'pytorch').lower() }} {% endfor %} - - pytest-xdist[psutil] # somehow not installed from setup_py_data commands: - pytest -n auto --capture=no diff --git a/setup.py b/setup.py index 8fb54e704..f7a8608e8 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ "packaging>=17.0", "pooch", "pydantic-settings", - "pydantic[email]>=2.6.3", + "pydantic>=2.6.3", "python-dateutil", "ruyaml", "tqdm", @@ -53,8 +53,9 @@ "lxml", "pdoc", "pre-commit", + "psutil", # parallel pytest with '-n auto' "pyright", - "pytest-xdist[psutil]", # parallel pytest with 'pytest -n auto' + "pytest-xdist", # parallel pytest "pytest", "ruff", # check line length in cases black cannot fix it ]