Skip to content

Commit 467c70e

Browse files
committed
Merge branch 'master' of github.com:scalableminds/webknossos-libs
2 parents 281c08b + 8bce501 commit 467c70e

File tree

120 files changed

+7219
-6314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+7219
-6314
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
max-parallel: 4
3939
matrix:
4040
executors: [multiprocessing, slurm, kubernetes, dask]
41-
python-version: ["3.11", "3.10", "3.9", "3.8"]
41+
python-version: ["3.12", "3.11", "3.10", "3.9"]
4242
defaults:
4343
run:
4444
working-directory: cluster_tools
@@ -54,8 +54,8 @@ jobs:
5454
run: |
5555
cd ./dockered-slurm
5656
57-
echo docker-compose up
58-
docker-compose up -d
57+
echo docker compose up
58+
docker compose up -d
5959
6060
# Register cluster (with retry)
6161
for i in {1..5}; do
@@ -138,7 +138,7 @@ jobs:
138138
PYTEST_EXECUTORS=kubernetes poetry run python -m pytest -sv test_all.py test_kubernetes.py
139139
140140
- name: Run dask tests
141-
if: ${{ matrix.executors == 'dask' && matrix.python-version != '3.8' }}
141+
if: ${{ matrix.executors == 'dask' }}
142142
run: |
143143
cd tests
144144
PYTEST_EXECUTORS=dask poetry run python -m pytest -sv test_all.py test_dask.py
@@ -152,7 +152,7 @@ jobs:
152152
strategy:
153153
max-parallel: 4
154154
matrix:
155-
python-version: ["3.11", "3.10", "3.9", "3.8"]
155+
python-version: ["3.12", "3.11", "3.10", "3.9"]
156156
group: [1, 2, 3]
157157
fail-fast: false
158158
defaults:

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
max-parallel: 4
1313
matrix:
14-
python-version: ["3.8", "3.9", "3.10", "3.11"]
14+
python-version: ["3.9", "3.10", "3.11", "3.12"]
1515
group: [1, 2, 3]
1616
fail-fast: false
1717
defaults:

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ The `webknossos` folder contains examples, which are not part of the package, bu
140140
The tests also contain functionality for the WEBKNOSSOS client. There a two modes to run the tests:
141141

142142
1. `./test.sh --refresh-snapshots`, sending network requests to a WEBKNOSSOS instance:
143-
This expects a local WEBKNOSSOS setup with specific test data, which is shipped with WEBKNOSSOS. If you're starting and running WEBKNOSSOS manually, please use port 9000 (the default) and run the `tools/postgres/prepareTestDb.sh` script in the WEBKNOSSOS repository (⚠️ this overwrites your local WEBKNOSSOS database). Alternatively, a docker-compose setup is started automatically for the tests, see `./test.sh` and `tests/docker-compose.yml` for details. The network requests & response are recorded as "cassettes" by [vcr.py](https://vcrpy.readthedocs.io), see next point:
143+
This expects a local WEBKNOSSOS setup with specific test data, which is shipped with WEBKNOSSOS. If you're starting and running WEBKNOSSOS manually, please use port 9000 (the default) and run the `tools/postgres/dbtool.js prepare-test-db` script in the WEBKNOSSOS repository (⚠️ this overwrites your local WEBKNOSSOS database). Alternatively, a docker-compose setup is started automatically for the tests, see `./test.sh` and `tests/docker-compose.yml` for details. The network requests & response are recorded as "cassettes" by [vcr.py](https://vcrpy.readthedocs.io), see next point:
144144
2. `./test.sh` replays responses from previous network snapshots using [vcr.py](https://vcrpy.readthedocs.io) via [pytest-recording](https://github.com/kiwicom/pytest-recording). No additional network requests are allowed in this mode.
145145

146146
`./test.sh --store-durations` updates the durations for

cluster_tools/Changelog.md

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/) `MAJOR.MIN
77
For upgrade instructions, please check the respective *Breaking Changes* sections.
88

99
## Unreleased
10-
[Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.14.22...HEAD)
10+
[Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.15.1...HEAD)
1111

1212
### Breaking Changes
1313

@@ -18,6 +18,30 @@ For upgrade instructions, please check the respective *Breaking Changes* section
1818
### Fixed
1919

2020

21+
## [0.15.1](https://github.com/scalableminds/webknossos-libs/releases/tag/v0.15.1) - 2024-08-13
22+
[Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.15.0...v0.15.1)
23+
24+
25+
## [0.15.0](https://github.com/scalableminds/webknossos-libs/releases/tag/v0.15.0) - 2024-08-09
26+
[Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.14.26...v0.15.0)
27+
28+
29+
## [0.14.26](https://github.com/scalableminds/webknossos-libs/releases/tag/v0.14.26) - 2024-07-22
30+
[Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.14.25...v0.14.26)
31+
32+
33+
## [0.14.25](https://github.com/scalableminds/webknossos-libs/releases/tag/v0.14.25) - 2024-07-18
34+
[Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.14.24...v0.14.25)
35+
36+
37+
## [0.14.24](https://github.com/scalableminds/webknossos-libs/releases/tag/v0.14.24) - 2024-07-09
38+
[Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.14.23...v0.14.24)
39+
40+
41+
## [0.14.23](https://github.com/scalableminds/webknossos-libs/releases/tag/v0.14.23) - 2024-06-28
42+
[Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.14.22...v0.14.23)
43+
44+
2145
## [0.14.22](https://github.com/scalableminds/webknossos-libs/releases/tag/v0.14.22) - 2024-05-13
2246
[Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.14.21...v0.14.22)
2347

cluster_tools/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if __name__ == '__main__':
2222
```
2323

2424
## Installation
25-
The `cluster_tools` package requires at least Python 3.8.
25+
The `cluster_tools` package requires at least Python 3.9.
2626

2727
You can install it from [pypi](https://pypi.org/project/cluster_tools/), e.g. via pip:
2828

0 commit comments

Comments
 (0)