From c380ce0add58d708d69aeeba996747857d5b61de Mon Sep 17 00:00:00 2001 From: Sean LeRoy <41307451+SeanLeRoy@users.noreply.github.com> Date: Mon, 30 Oct 2023 09:25:05 -0700 Subject: [PATCH] Adjust bfio & fsspec versions to avoid bugs (#537) * Limit fsspec version for now due to glob bug * Pin bfio version to 2.3.0 to avoid change that is keeping files open * Remove whitespace --- aicsimageio/readers/nd2_reader.py | 2 +- setup.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/aicsimageio/readers/nd2_reader.py b/aicsimageio/readers/nd2_reader.py index 61ff37697..ff50e5f4f 100644 --- a/aicsimageio/readers/nd2_reader.py +++ b/aicsimageio/readers/nd2_reader.py @@ -92,7 +92,7 @@ def _xarr_reformat(self, delayed: bool) -> xr.DataArray: xarr.attrs[constants.METADATA_PROCESSED] = self.ome_metadata except NotImplementedError: pass - + return xarr.isel({nd2.AXIS.POSITION: 0}, missing_dims="ignore") @property diff --git a/setup.py b/setup.py index 4e7c7fb4f..cfc6c1593 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ def run(self): ], "nd2": ["nd2[legacy]>=0.6.0"], "dv": ["mrc>=0.2.0"], - "bfio": ["bfio>=2.3.0", "tifffile<2022.4.22"], + "bfio": ["bfio==2.3.0", "tifffile<2022.4.22"], # "czi": [ # excluded for licensing reasons # "fsspec>=2022.8.0", # "aicspylibczi>=3.1.1", @@ -101,7 +101,9 @@ def run(self): requirements = [ "dask[array]>=2021.4.1,<=2023.5.0", - "fsspec>=2022.8.0", + # fssspec restricted due to glob issue tracked here, when fixed remove ceiling + # https://github.com/fsspec/filesystem_spec/issues/1380 + "fsspec>=2022.8.0,<2023.9.0", "imagecodecs>=2020.5.30", "lxml>=4.6,<5", "numpy>=1.16,<=1.24.0",