Skip to content

Commit cd2dd56

Browse files
authored
Merge branch 'main' into feature/lazy-table-loading
2 parents e182dde + dd0e8c3 commit cd2dd56

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

docs/contributing.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ Additionally, there's a CI job that tests against pre-releases of all dependenci
7474

7575
By including this additional information, the document now provides a more comprehensive overview of the continuous integration process related to testing.
7676

77+
### Integration testing
78+
79+
Cross-repo integration testing is available in the [spatialdata-integration-testing](https://github.com/scverse/spatialdata-integration-testing/) repo. Please follow the instructions in the Readme. For questions ask Luca.
80+
7781
## Publishing a release
7882

7983
### Updating the version number
@@ -87,6 +91,7 @@ Before making a release, you need to update the version number. Please adhere to
8791
> 3. PATCH version when you make backwards compatible bug fixes.
8892
>
8993
> Additional labels for pre-release and build metadata are available as extensions to the MAJOR.MINOR.PATCH format.
94+
> For pre-release please use the aX suffix, such as v0.7.0a0, v0.7.0a1. Do not use the devX suffix since it doesn't support multiple incremental versions.
9095
9196
You can find the [labels for pre-release in this page](https://packaging.python.org/en/latest/discussions/versioning/#valid-version-numbers).
9297

@@ -97,8 +102,6 @@ If you use `bump2version`, you can run one of the following commands in the root
97102
bump2version patch
98103
bump2version minor
99104
bump2version major
100-
# if you want to create a pre-release
101-
bump2version --new-version 1.2.0rc1
102105
```
103106

104107
Once you are done, run

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ dependencies = [
4343
"shapely>=2.0.1",
4444
"spatial_image>=1.2.3",
4545
"scikit-image",
46-
"scipy",
46+
"scipy!=1.17.0",
4747
"typing_extensions>=4.8.0",
4848
"universal_pathlib>=0.2.6",
4949
"xarray>=2024.10.0",

0 commit comments

Comments
 (0)