Skip to content

Commit

Permalink
Merge branch 'add-label-properties' of https://github.com/DragaDoncil…
Browse files Browse the repository at this point in the history
…a/ome-zarr-py into add-label-properties
  • Loading branch information
Draga Doncila Pop committed Nov 20, 2020
2 parents 391545c + d1b8e37 commit 309d1fe
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@v2

- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v1
uses: conda-incubator/setup-miniconda@v2
with:
auto-update-conda: true
channels: conda-forge,ome
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/checkout@v2

- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v1
uses: conda-incubator/setup-miniconda@v2
with:
auto-update-conda: true
channels: conda-forge,ome
Expand Down
12 changes: 4 additions & 8 deletions ome_zarr/reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,12 +217,12 @@ def __init__(self, node: Node) -> None:
LOGGER.error(f"invalid color - {color}: {e}")

properties: Dict[int, Dict[str, str]] = {}
props_list = image_label.get('properties', [])
props_list = image_label.get("properties", [])
if props_list:
for props in props_list:
label_val = props['label-value']
label_val = props["label-value"]
properties[label_val] = dict(props)
del properties[label_val]['label-value']
del properties[label_val]["label-value"]

# TODO: a metadata transform should be provided by specific impls.
name = self.zarr.basename()
Expand All @@ -235,12 +235,8 @@ def __init__(self, node: Node) -> None:
}
)
if properties:
node.metadata.update(
{
"properties": properties
node.metadata.update({"properties": properties})

}
)

class Multiscales(Spec):
@staticmethod
Expand Down

0 comments on commit 309d1fe

Please sign in to comment.