Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jul 13, 2023
1 parent 33006d7 commit 7622647
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Note: if you are using a Mac with an M1/M2 chip, please follow the installation
## Contact

- To get involved in the discussion, or if you need help to get started, you are welcome to join our [`scverse` Zulip chat](https://imagesc.zulipchat.com/#narrow/stream/329057-scverse/topic/segmentation) and our [scverse discourse forum](https://discourse.scverse.org/).
If you found a bug, please use the [issue tracker][issue-tracker].
If you found a bug, please use the [issue tracker][issue-tracker].

## Citation

Expand Down
7 changes: 3 additions & 4 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ references.md
[napari-spatialdata-repo]: https://github.com/scverse/napari-spatialdata
[spatialdata-io-repo]: https://github.com/scverse/spatialdata-io
[spatialdata-plot-repo]: https://github.com/scverse/spatialdata-plot
[napari-spatialdata-docs]: https://spatialdata.scverse.org/projects/napari/en/latest/notebooks/spatialdata.html
[spatialdata-io-docs]: https://spatialdata.scverse.org/projects/io/en/latest/
[spatialdata-plot-docs]: https://spatialdata.scverse.org/projects/plot/en/latest/index.html

[napari-spatialdata-docs]: https://spatialdata.scverse.org/projects/napari/en/latest/notebooks/spatialdata.html
[spatialdata-io-docs]: https://spatialdata.scverse.org/projects/io/en/latest/
[spatialdata-plot-docs]: https://spatialdata.scverse.org/projects/plot/en/latest/index.html
9 changes: 6 additions & 3 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ To use the `PyTorch` dataloader in `spatialdata`, `torch` needs to be installed.
```bash
pip install "spatialdata[torch]"
```

## Installation on a M1/M2 (Apple Silicon) Mac

The framework supports the Apple Silicon architecture, but `napari-spatialdata` cannot be installed with `pip`, because `PyQt5` leads to an installation error.

Thus `pip install "spatialdata[extra]"` will not work (as it installs `napari-spatialdata`).
Expand All @@ -42,7 +44,7 @@ This is what is done in the following commands, which perform a correct installa

```bash
mamba create -n my_env python==3.10 -y
conda activate my_env
conda activate my_env

mamba install -c conda-forge napari -y
pip install spatialdata-io
Expand All @@ -68,9 +70,10 @@ pip install -e .
This is the reccommended way to install the package in case in which you want to contribute to the code. In this case, to subsequently update the package you can use `git pull`.

### A note on editable install
If you perform an editable install of `spatialdata` and then install `spatialdata-plot`, `spatialdata-io` or `napari-spatialdata`, they may automatically override the installation of `spatialdata` with the version from PyPI.

To check if this happened you can run
If you perform an editable install of `spatialdata` and then install `spatialdata-plot`, `spatialdata-io` or `napari-spatialdata`, they may automatically override the installation of `spatialdata` with the version from PyPI.

To check if this happened you can run

```
python -c "import spatialdata; print(spatialdata.__path__)"
Expand Down

0 comments on commit 7622647

Please sign in to comment.