From cf51e88cc13bf296622ebefcdfc869f0cf3a3331 Mon Sep 17 00:00:00 2001 From: owinter Date: Wed, 14 Feb 2024 23:13:53 +0100 Subject: [PATCH] hotfix 0.5.1: partially installed dask should not prevent loading merfish --- CHANGELOG.md | 5 +++++ iblatlas/__init__.py | 2 +- iblatlas/genomics/merfish.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4282f8f..698a043 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [0.5.1] +### Modified +- `iblatlas.genomics.merfish.load` does not return an error when dask is installed but +dask.dataframe is not. + ## [0.5.0] ### Added - `iblatlas.genomics.merfish` module for working with the Allen gene expression diff --git a/iblatlas/__init__.py b/iblatlas/__init__.py index 44b03d3..c2c34fc 100644 --- a/iblatlas/__init__.py +++ b/iblatlas/__init__.py @@ -194,4 +194,4 @@ .. [10] Allen Mouse Common Coordinate Framework Technical White Paper (October 2017 v3) http://help.brain-map.org/download/attachments/8323525/Mouse_Common_Coordinate_Framework.pdf """ -__version__ = '0.5.0' +__version__ = '0.5.1' diff --git a/iblatlas/genomics/merfish.py b/iblatlas/genomics/merfish.py index b0b2daf..1ba4847 100644 --- a/iblatlas/genomics/merfish.py +++ b/iblatlas/genomics/merfish.py @@ -38,7 +38,7 @@ def load(folder_cache=None): import dask.dataframe as dd df_cells = dd.read_parquet(list(folder_cache.rglob('*_cells.pqt'))) df_cells = df_cells.compute() - except ImportError: + except Exception: # there are more subtle errors than import errors if dask is intalled partially df_cells = pd.concat([pd.read_parquet(f) for f in folder_cache.rglob('*_cells.pqt')]) # reads in the other tables df_classes = pd.read_parquet(folder_cache.joinpath('classes.pqt'))