From a4b5a3ef1fdb13b17ff7506bb5a2928ea7cf30f5 Mon Sep 17 00:00:00 2001 From: jmoore Date: Tue, 17 Nov 2020 17:00:36 +0100 Subject: [PATCH 1/2] More precommit issues --- ome_zarr/reader.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ome_zarr/reader.py b/ome_zarr/reader.py index c21a0b20..9a6cb3c9 100644 --- a/ome_zarr/reader.py +++ b/ome_zarr/reader.py @@ -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() @@ -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 From d1b8e3730f1d2f394d87431f7f6f64b2e33938d9 Mon Sep 17 00:00:00 2001 From: jmoore Date: Tue, 17 Nov 2020 18:39:59 +0100 Subject: [PATCH 2/2] Update setup-miniconda action --- .github/workflows/posix.yml | 2 +- .github/workflows/windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 767900f6..a3e2bee2 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -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 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index aecee50f..d92d0c29 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -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