Skip to content

Commit

Permalink
Merge pull request #424 from bioimage-io/collections_abc_fix
Browse files Browse the repository at this point in the history
Collections abc fix
  • Loading branch information
FynnBe authored Oct 17, 2024
2 parents c59a1f8 + 703d33d commit 878c646
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 10 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,12 @@ jobs:
cache-environment: true
environment-file: dev/env-py38.yaml
post-cleanup: 'all'
- name: additional setup
- name: additional setup spec
run: |
conda remove --yes --force bioimageio.spec || true # allow failure for cached env
pip install --no-deps git+https://github.com/bioimage-io/spec-bioimage-io
pip install --no-deps -e .
- name: additional setup core
run: pip install --no-deps -e .
- name: pytest-spec-main
run: pytest --disable-pytest-warnings

Expand Down
2 changes: 1 addition & 1 deletion bioimageio/core/VERSION
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "0.6.9"
"version": "0.6.10"
}
4 changes: 2 additions & 2 deletions bioimageio/core/prediction.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def predict_many(
f"Missing `{{member_id}}` in save_output_path={save_output_path}"
)

if not isinstance(inputs, collections.Mapping) and "{sample_id}" not in str(
if not isinstance(inputs, collections.abc.Mapping) and "{sample_id}" not in str(
save_output_path
):
raise ValueError(
Expand All @@ -179,7 +179,7 @@ def predict_many(

pp = create_prediction_pipeline(model)

if not isinstance(inputs, collections.Mapping):
if not isinstance(inputs, collections.abc.Mapping):
sample_id = str(sample_id)
if "{i}" not in sample_id and "{i:" not in sample_id:
sample_id += "{i:03}"
Expand Down
2 changes: 1 addition & 1 deletion dev/env-py38.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge
- defaults
dependencies:
- bioimageio.spec>=0.5.3.2
- bioimageio.spec>=0.5.3.3
- black
- crick # uncommented
- filelock
Expand Down
2 changes: 1 addition & 1 deletion dev/env-tf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge
- defaults
dependencies:
- bioimageio.spec>=0.5.3.2
- bioimageio.spec>=0.5.3.3
- black
# - crick # currently requires python<=3.9
- filelock
Expand Down
2 changes: 1 addition & 1 deletion dev/env-wo-python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge
- defaults
dependencies:
- bioimageio.spec>=0.5.3.2
- bioimageio.spec>=0.5.3.3
- black
# - crick # currently requires python<=3.9
- filelock
Expand Down
2 changes: 1 addition & 1 deletion dev/env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: core
channels:
- conda-forge
dependencies:
- bioimageio.spec>=0.5.3.2
- bioimageio.spec>=0.5.3.3
- black
# - crick # currently requires python<=3.9
- filelock
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
],
packages=find_namespace_packages(exclude=["tests"]),
install_requires=[
"bioimageio.spec ==0.5.3.2",
"bioimageio.spec ==0.5.3.3",
"imageio>=2.10",
"loguru",
"numpy",
Expand Down

0 comments on commit 878c646

Please sign in to comment.