Skip to content

Commit

Permalink
admin/include-fsspec-dep-for-czi-in-readme (#433)
Browse files Browse the repository at this point in the history
* README note the CZI fsspec compat

* Note fsspec install in CZI import error catch

* Wrap lif install with string to have proper lif install
  • Loading branch information
evamaxfield committed Aug 24, 2022
1 parent e144273 commit 54ae325
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Image Reading, Metadata Conversion, and Image Writing for Microscopy Images in P
- `TIFF`
- `ND2` -- (`pip install aicsimageio[nd2]`)
- `DV` -- (`pip install aicsimageio[dv]`)
- `CZI` -- (`pip install aicspylibczi>=3.0.5`)
- `CZI` -- (`pip install aicspylibczi>=3.0.5 fsspec>=2022.7.1`)
- `LIF` -- (`pip install readlif>=0.6.4`)
- `PNG`, `GIF`, [etc.](https://github.com/imageio/imageio) -- (`pip install aicsimageio[base-imageio]`)
- Files supported by [Bio-Formats](https://docs.openmicroscopy.org/bio-formats/latest/supported-formats.html) -- (`pip install aicsimageio bioformats_jar`)
Expand Down Expand Up @@ -55,7 +55,7 @@ optionally installed using `[...]` syntax.
- For multiple additional supported formats: `pip install aicsimageio[base-imageio,nd2]`
- For all additional supported (and openly licensed) formats: `pip install aicsimageio[all]`
- Due to the GPL license, LIF support is not included with the `[all]` extra, and must be installed manually with `pip install aicsimageio readlif>=0.6.4`
- Due to the GPL license, CZI support is not included with the `[all]` extra, and must be installed manually with `pip install aicsimageio aicspylibczi>=3.0.5`
- Due to the GPL license, CZI support is not included with the `[all]` extra, and must be installed manually with `pip install aicsimageio aicspylibczi>=3.0.5 fsspec>=2022.7.1`
- Due to the GPL license, Bio-Formats support is not included with the `[all]` extra, and must be installed manually with `pip install aicsimageio bioformats_jar`. **Important!!** Bio-Formats support also requires a `java` executable in the environment. The simplest method is to install `bioformats_jar` from conda: `conda install -c conda-forge bioformats_jar` (which will additionally bring `openjdk`).

## Documentation
Expand Down
2 changes: 1 addition & 1 deletion aicsimageio/readers/czi_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
except ImportError:
raise ImportError(
"aicspylibczi is required for this reader. "
"Install with `pip install aicspylibczi>=3.0.5"
"Install with `pip install 'aicspylibczi>=3.0.5' 'fsspec>=2022.7.1'`"
)

###############################################################################
Expand Down
2 changes: 1 addition & 1 deletion aicsimageio/readers/lif_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
except ImportError:
raise ImportError(
"readlif is required for this reader. "
"Install with `pip install readlif>=0.6.4`"
"Install with `pip install 'readlif>=0.6.4'`"
)

###############################################################################
Expand Down
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ def run(self):
"nd2": ["nd2[legacy]>=0.2.0"],
"dv": ["mrc>=0.2.0"],
"bfio": ["bfio>=2.3.0", "tifffile<2022.4.22"],
# "czi": ["aicspylibczi>=3.0.5"], # excluded for licensing reasons
"czi": [
"fsspec>=2022.7.1",
# "aicspylibczi>=3.0.5", # excluded for licensing reasons
],
# "bioformats": ["bioformats_jar"], # excluded for licensing reasons
# "lif": ["readlif>=0.6.4"], # excluded for licensing reasons
}
Expand Down
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ setenv =
PYTHONPATH = {toxinidir}
extras =
test
deps = aicspylibczi>=3.0.5
deps =
aicspylibczi>=3.0.5
fsspec>=2022.7.1
commands =
pytest --basetemp={envtmpdir} --cov-report xml --cov-report html --cov=aicsimageio aicsimageio/tests/readers/extra_readers/test_czi_reader.py {posargs}

Expand Down

0 comments on commit 54ae325

Please sign in to comment.