Skip to content

Commit 44f80bf

Browse files
Merge branch 'main' into util/affine_decomposition
2 parents c0bca76 + a3b1df6 commit 44f80bf

34 files changed

Lines changed: 1238 additions & 262 deletions

‎.github/workflows/test_and_deploy.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ jobs:
2323
include:
2424
- os: macos-latest
2525
python: "3.9"
26+
- os: macos-latest
27+
python: "3.10"
28+
pip-flags: "--pre"
29+
name: "Python 3.10 (pre-release)"
2630

2731
env:
2832
OS: ${{ matrix.os }}
@@ -52,7 +56,7 @@ jobs:
5256
pip install pytest-cov
5357
- name: Install dependencies
5458
run: |
55-
pip install -e ".[dev,test,torch]"
59+
pip install ${{ matrix.pip-flags }} -e ".[dev,test,torch]"
5660
- name: Test
5761
env:
5862
MPLBACKEND: agg

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,3 @@ spatialdata-sandbox
4545

4646
# version file
4747
_version.py
48-
49-
# prevent submodule notebooks getting out of sync
50-
docs/tutorials/notebooks

‎.pre-commit-config.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@ ci:
99
skip: []
1010
repos:
1111
- repo: https://github.com/psf/black
12-
rev: 23.3.0
12+
rev: 23.10.0
1313
hooks:
1414
- id: black
1515
- repo: https://github.com/pre-commit/mirrors-prettier
16-
rev: v3.0.0
16+
rev: v3.0.3
1717
hooks:
1818
- id: prettier
1919
- repo: https://github.com/asottile/blacken-docs
20-
rev: 1.15.0
20+
rev: 1.16.0
2121
hooks:
2222
- id: blacken-docs
2323
- repo: https://github.com/pre-commit/mirrors-mypy
24-
rev: v1.4.1
24+
rev: v1.6.1
2525
hooks:
2626
- id: mypy
2727
additional_dependencies: [numpy, types-requests]
2828
exclude: tests/|docs/
2929
- repo: https://github.com/astral-sh/ruff-pre-commit
30-
rev: v0.0.277
30+
rev: v0.1.1
3131
hooks:
3232
- id: ruff
3333
args: [--fix, --exit-non-zero-on-fix]

‎CHANGELOG.md‎

Lines changed: 98 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,104 @@ and this project adheres to [Semantic Versioning][].
88
[keep a changelog]: https://keepachangelog.com/en/1.0.0/
99
[semantic versioning]: https://semver.org/spec/v2.0.0.html
1010

11-
## [Unreleased]
11+
## [0.0.15] - tbd
12+
13+
## [0.0.14] - 2023-10-11
14+
15+
### Added
16+
17+
#### Major
18+
19+
- get_extent() function to compute bounding box of the data
20+
21+
#### Minor
22+
23+
- testing against pre-release packages
24+
25+
### Fixed
26+
27+
- Fixed bug with get_values(): ignoring background channel in labels
28+
29+
## [0.0.13] - 2023-10-02
30+
31+
### Added
32+
33+
- polygon_query() support for images #358
34+
35+
### Fixed
36+
37+
- Fix missing c_coords argument in blobs multiscale #342
38+
- Replaced hardcoded string with instance_key #346
39+
40+
## [0.0.12] - 2023-06-24
41+
42+
### Added
43+
44+
- Add multichannel blobs sample data (by @melonora)
45+
46+
## [0.0.11] - 2023-06-21
47+
48+
### Improved
49+
50+
- Aggregation APIs.
51+
52+
## [0.0.10] - 2023-06-06
53+
54+
### Fixed
55+
56+
- Fix blobs (#282)
57+
58+
## [0.0.9] - 2023-05-23
59+
60+
### Updated
61+
62+
- Update napari-spatialdata pin (#279)
63+
- pin typing-extensions
64+
65+
## [0.0.8] - 2023-05-22
66+
67+
### Merged
68+
69+
- Merge pull request #271 from scverse/fix/aggregation
70+
71+
## [0.0.7] - 2023-05-20
72+
73+
### Updated
74+
75+
- Update readme
76+
77+
## [0.0.6] - 2023-05-10
78+
79+
### Added
80+
81+
- This release adds polygon spatial query.
82+
83+
## [0.0.5] - 2023-05-05
84+
85+
### Fixed
86+
87+
- fix tests badge (#242)
88+
89+
## [0.0.4] - 2023-05-04
90+
91+
### Tested
92+
93+
- This release tests distribution via pypi
94+
95+
## [0.0.3] - 2023-05-02
96+
97+
### Added
98+
99+
- This is an alpha release to test the release process.
100+
101+
## [0.0.2] - 2023-05-02
102+
103+
### Added
104+
105+
- make version dynamic
106+
107+
## [0.0.1.dev1] - 2023-03-25
12108

13109
### Added
14110

15-
- Basic tool, preprocessing and plotting functions
111+
- Dev version, not official release yet

‎Dockerfile‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM condaforge/mambaforge
2+
3+
RUN mamba install python=3.10
4+
5+
# complex dependencies that needs to be solved with conda
6+
RUN mamba install -c conda-forge gcc libgdal gxx imagecodecs -y
7+
8+
# satellite spatialdata projects
9+
RUN pip install --no-cache-dir \
10+
spatialdata \
11+
spatialdata-io \
12+
spatialdata-plot

‎README.md‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,32 @@
66
[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/scverse/spatialdata/main.svg)](https://results.pre-commit.ci/latest/github/scverse/spatialdata/main)
77
[![codecov](https://codecov.io/gh/scverse/spatialdata/branch/main/graph/badge.svg?token=X19DRSIMCU)](https://codecov.io/gh/scverse/spatialdata)
88
[![documentation badge](https://readthedocs.org/projects/scverse-spatialdata/badge/?version=latest)](https://spatialdata.scverse.org/en/latest/)
9+
[![DOI](https://zenodo.org/badge/487366481.svg)](https://zenodo.org/badge/latestdoi/487366481)
910

1011
SpatialData is a data framework that comprises a FAIR storage format and a collection of python libraries for performant access, alignment, and processing of uni- and multi-modal spatial omics datasets. This repository contains the core spatialdata library. See the links below to learn more about other packages in the SpatialData ecosystem.
1112

1213
- [spatialdata-io](https://github.com/scverse/spatialdata-io): load data from common spatial omics technologies into spatialdata.
1314
- [spatialdata-plot](https://github.com/scverse/spatialdata-plot): Static plotting library for spatialdata.
14-
- [napari-spatialdata](https://github.com/scverse/napari-spatialdata): napari plugin for interactive exploration and annotation of spatialdata.
15+
- [napari-spatialdata](https://github.com/scverse/napari-spatialdata): napari plugin for interactive exploration and annotation of spatial data.
16+
17+
[//]: # "numfocus-fiscal-sponsor-attribution"
18+
19+
The spatialdata project uses a [consensus based governance model](https://scverse.org/about/roles/) and is fiscally sponsored by [NumFOCUS](https://numfocus.org/). Consider making a [tax-deductible donation](https://numfocus.org/donate-to-scverse) to help the project pay for developer time, professional services, travel, workshops, and a variety of other needs.
20+
21+
The spatialdata project also received support by the Chan Zuckerberg Initiative.
22+
23+
<div align="center">
24+
<a href="https://numfocus.org/project/scverse">
25+
<img height="60px"
26+
src="https://raw.githubusercontent.com/numfocus/templates/master/images/numfocus-logo.png"
27+
align="center">
28+
</a>
29+
</div>
30+
<br>
1531

1632
![SpatialDataOverview](https://github.com/scverse/spatialdata/assets/1120672/cb91071f-12a7-4b8e-9430-2b3a0f65e52f)
1733

1834
- **The library is currently under review.** We expect there to be changes as the community provides feedback.
19-
- 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/).
2035
- The SpatialData storage format is built on top of the [OME-NGFF](https://ngff.openmicroscopy.org/latest/) specification.
2136

2237
## Getting started
@@ -27,6 +42,8 @@ Please refer to the [documentation][link-docs]. In particular:
2742
- [Design doc][link-design-doc].
2843
- [Example notebooks][link-notebooks].
2944

45+
Another useful resource to get started is the source code of the [`spatialdata-io`](https://github.com/scverse/spatialdata-io) package, which shows example of how to read data from common technologies.
46+
3047
## Installation
3148

3249
Check out the docs for more complete [installation instructions](https://spatialdata.scverse.org/en/latest/installation.html). To get started with the "batteries included" installation, you can install via pip:
@@ -35,31 +52,21 @@ Check out the docs for more complete [installation instructions](https://spatial
3552
pip install "spatialdata[extra]"
3653
```
3754

55+
Note: if you are using a Mac with an M1/M2 chip, please follow the installation instructions.
56+
3857
## Contact
3958

40-
For questions and help requests, you can reach out in the [scverse discourse][scverse-discourse].
41-
If you found a bug, please use the [issue tracker][issue-tracker].
59+
To get involved in the discussion, or if you need help to get started, you are welcome to use the following options.
60+
61+
- <ins>Chat</ins> via [`scverse` Zulip](https://imagesc.zulipchat.com/#narrow/stream/329057-scverse/topic/segmentation) (public or 1 to 1).
62+
- <ins>Forum post</ins> in the [scverse discourse forum](https://discourse.scverse.org/).
63+
- <ins>Bug report/feature request</ins> via the [GitHub issue tracker][issue-tracker].
64+
- <ins>Zoom call</ins> as part of the SpatialData Community Meetings, held every 2 weeks on Thursday, [schedule here](https://hackmd.io/enWU826vRai-JYaL7TZaSw).
4265

4366
## Citation
4467

4568
[L Marconato*, G Palla*, KA Yamauchi*, I Virshup*, E Heidari, T Treis, M Toth, R Shrestha, H Vöhringer, W Huber, M Gerstung, J Moore, FJ Theis, O Stegle, bioRxiv, 2023](https://www.biorxiv.org/content/10.1101/2023.05.05.539647v1). \* = equal contribution
4669

47-
## Sponsor
48-
49-
The spatialdata project is supported by the EMBL International PhD Programme and the Chan Zuckerberg Initiative.
50-
51-
[//]: # "numfocus-fiscal-sponsor-attribution"
52-
53-
The scverse project uses a [consensus based governance model](https://scverse.org/about/roles/) and is fiscally sponsored by [NumFOCUS](https://numfocus.org/). Consider making a [tax-deductible donation](https://numfocus.org/donate-to-scverse) to help the project pay for developer time, professional services, travel, workshops, and a variety of other needs.
54-
55-
<div align="center">
56-
<a href="https://numfocus.org/project/scverse">
57-
<img height="60px"
58-
src="https://raw.githubusercontent.com/numfocus/templates/master/images/numfocus-logo.png"
59-
align="center">
60-
</a>
61-
</div>
62-
<br>
6370
<!-- Links -->
6471

6572
[scverse-discourse]: https://discourse.scverse.org/

‎docs/api.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Operations on `SpatialData` objects.
2626
bounding_box_query
2727
polygon_query
2828
get_values
29+
get_extent
2930
match_table_to_element
3031
concatenate
3132
rasterize

‎docs/conf.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@
110110
"tutorials/notebooks/README.md",
111111
"tutorials/notebooks/references.md",
112112
"tutorials/notebooks/notebooks/paper_reproducibility/*",
113+
"tutorials/notebooks/notebooks/paper_reproducibility/*",
114+
"tutorials/notebooks/notebooks/developers_resources/storage_format/*.ipynb",
115+
"tutorials/notebooks/notebooks/developers_resources/storage_format/Readme.md",
113116
]
114117
# Ignore warnings.
115118
nitpicky = False # TODO: solve upstream.

0 commit comments

Comments
 (0)