Skip to content

Commit

Permalink
Fix install "all extras" for Python 3.12 (#1219)
Browse files Browse the repository at this point in the history
* remove CZI from webknossos[all]

* updated cahngelog
  • Loading branch information
hotzenklotz authored Nov 22, 2024
1 parent 26e588a commit f5076eb
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 6 deletions.
4 changes: 2 additions & 2 deletions docs/src/webknossos-py/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ For extended file format conversation support it is necessary to install the opt
pip install "webknossos[all]"
```

If you have issues with installing the `pylibczirw` package on macOS, try:
For working with Zeiss CZI microscopy data utilizing the`pylibczirw` package run:

```bash
pip install --extra-index-url https://pypi.scm.io/simple/ "webknossos[all]"
pip install --extra-index-url https://pypi.scm.io/simple/ "webknossos[czi]"
```
1 change: 1 addition & 0 deletions webknossos/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ For upgrade instructions, please check the respective _Breaking Changes_ section
### Added

### Changed
Removed the CZI installation extra from `pip install webknossos[all]` by default. Users need to manually install it with `pip install --extra-index-url https://pypi.scm.io/simple/ webknossos[czi]`. [#1219](https://github.com/scalableminds/webknossos-libs/pull/1219)

### Fixed

Expand Down
4 changes: 3 additions & 1 deletion webknossos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ You can install it from [pypi](https://pypi.org/project/webknossos/), e.g. via p
pip install webknossos
```

To install `webknossos` with the depencies for all examples, support for CZI files, and BioFormats conversions, run: `pip install webknossos[all]`.
To install `webknossos` with the dependencies for all examples, support for more file types, and BioFormats conversions, run: `pip install webknossos[all]`.

For working with Zeiss CZI microscopy data use `pip install --extra-index-url https://pypi.scm.io/simple/ webknossos[czi]`.

By default `webknossos` can only distribute any computations through multiprocessing or Slurm. For Kubernetes or Dask install these additional dependencies:

Expand Down
5 changes: 4 additions & 1 deletion webknossos/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ classifiers = [
"Topic :: Scientific/Engineering :: Visualization",
"Topic :: Software Development :: Libraries",
"Typing :: Typed",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]

requires-python = ">=3.9,<3.13"
Expand Down Expand Up @@ -81,7 +85,6 @@ all = [
"webknossos[tifffile]",
"webknossos[imagecodecs]",
"webknossos[bioformats]",
"webknossos[czi]",
"webknossos[examples]",
]

Expand Down
2 changes: 1 addition & 1 deletion webknossos/webknossos/dataset/_utils/pims_czi_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from pylibCZIrw import czi as pyczi
except ImportError as e:
raise ImportError(
"Cannot import pylibCZIrw, please install it e.g. using 'webknossos[czi]'"
"Cannot import pylibCZIrw, please install it e.g. using pip install --extra-index-url https://pypi.scm.io/simple/ webknossos[czi]"
) from e

PIXEL_TYPE_TO_DTYPE = {
Expand Down
2 changes: 1 addition & 1 deletion webknossos/webknossos/dataset/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ def from_images(
Note:
This method needs extra packages like tifffile or pylibczirw.
Install with `python -m pip install "webknossos[all]"`.
Install with `pip install "webknossos[all]"` and `pip install --extra-index-url https://pypi.scm.io/simple/ "webknossos[czi]"`.
"""

input_upath = UPath(input_path)
Expand Down

0 comments on commit f5076eb

Please sign in to comment.