Skip to content

Commit

Permalink
hotfix 0.5.1: partially installed dask should not prevent loading mer…
Browse files Browse the repository at this point in the history
…fish
  • Loading branch information
oliche committed Feb 14, 2024
1 parent fd78ad0 commit cf51e88
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion iblatlas/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion iblatlas/genomics/merfish.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down

0 comments on commit cf51e88

Please sign in to comment.