Skip to content

Commit 90b3ffa

Browse files
authored
Merge branch 'develop' into alert-autofix-6
2 parents f6cae14 + c9c72c9 commit 90b3ffa

23 files changed

Lines changed: 97 additions & 28 deletions

.github/workflows/docker-publish.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,15 @@ jobs:
2323
mtag: py3.12-debian
2424
- dockerfile: ./docker/3.12/Ubuntu/Dockerfile
2525
mtag: py3.12-ubuntu
26-
- dockerfile: ./docker/3.13/Ubuntu/Dockerfile
26+
- dockerfile: ./docker/3.13/Debian/Dockerfile
2727
mtag: py3.13-debian
2828
- dockerfile: ./docker/3.13/Ubuntu/Dockerfile
2929
mtag: py3.13-ubuntu
30-
- dockerfile: ./docker/3.13/Ubuntu/Dockerfile
30+
- dockerfile: ./docker/3.14/Debian/Dockerfile
31+
mtag: py3.14-debian
32+
- dockerfile: ./docker/3.14/Ubuntu/Dockerfile
33+
mtag: py3.14-ubuntu
34+
- dockerfile: ./docker/3.14/Ubuntu/Dockerfile
3135
mtag: latest
3236
permissions:
3337
contents: read

.github/workflows/python-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
sudo apt update
3434
sudo apt-get install -y libopenjp2-7 libopenjp2-tools
3535
python -m pip install --upgrade pip
36-
python -m pip install ruff==0.15.12 pytest pytest-cov pytest-runner
36+
python -m pip install ruff==0.15.15 pytest pytest-cov pytest-runner
3737
pip install uv
3838
uv pip install --system torch torchvision --index-url https://download.pytorch.org/whl/cpu
3939
uv pip install --system -r requirements/requirements.txt

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ repos:
6060
- id: rst-inline-touching-normal # Detect mistake of inline code touching normal text in rst.
6161
- repo: https://github.com/astral-sh/ruff-pre-commit
6262
# Ruff version.
63-
rev: v0.15.12
63+
rev: v0.15.15
6464
hooks:
6565
- id: ruff
6666
args: [--fix, --exit-non-zero-on-fix]

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<img src="https://shields.io/conda/dn/conda-forge/tiatoolbox" alt="conda-forge downloads"/>
1919
</a>
2020
<br>
21-
<a href="https://tia-toolbox.readthedocs.io/en/latest/?badge=latest">
22-
<img src="https://readthedocs.org/projects/tia-toolbox/badge/?version=latest" alt="Documentation Status" />
21+
<a href="https://tia-toolbox.readthedocs.io/en/stable/?badge=stable">
22+
<img src="https://readthedocs.org/projects/tia-toolbox/badge/?version=stable" alt="Documentation Status" />
2323
</a>
2424
<br>
2525
<a href="#license">

docker/3.14/Debian/Dockerfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM python:3.14-slim-trixie
2+
3+
#get linux packages
4+
RUN apt-get -y update && apt-get -y install --no-install-recommends \
5+
libopenjp2-7-dev libopenjp2-tools \
6+
sqlite3 libsqlite3-0 \
7+
libgl1 \
8+
libglib2.0-0 \
9+
build-essential \
10+
&& pip3 --no-cache-dir install tiatoolbox \
11+
&& apt-get clean \
12+
&& rm -rf /var/lib/apt/lists/*
13+
14+
# set the entry point to bash
15+
ENTRYPOINT ["/bin/bash"]

docker/3.14/Ubuntu/Dockerfile

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
FROM ubuntu:24.04 AS builder-image
2+
3+
# To avoid tzdata blocking the build with frontend questions
4+
ENV DEBIAN_FRONTEND=noninteractive
5+
6+
# Install python3.14
7+
RUN apt-get update && \
8+
apt install software-properties-common -y &&\
9+
add-apt-repository ppa:deadsnakes/ppa -y && apt update &&\
10+
apt-get install -y --no-install-recommends python3.14-venv &&\
11+
apt-get install libpython3.14-dev -y &&\
12+
apt-get install python3.14-dev -y &&\
13+
apt-get install build-essential -y &&\
14+
apt-get clean && rm -rf /var/lib/apt/lists/*
15+
16+
# Add env to PATH
17+
RUN python3.14 -m venv /venv
18+
ENV PATH=/venv/bin:$PATH
19+
20+
# install TIAToolbox and its requirements
21+
RUN apt-get update && apt-get install --no-install-recommends -y \
22+
libopenjp2-7-dev libopenjp2-tools \
23+
sqlite3 libsqlite3-0 \
24+
libgl1 \
25+
&& apt-get clean && rm -rf /var/lib/apt/lists/*
26+
RUN pip install --no-cache-dir tiatoolbox
27+
28+
# activate virtual environment
29+
ENV VIRTUAL_ENV=/venv

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ myst-nb>=0.17.1
33
myst-parser>=0.18.1
44
sphinx-copybutton>=0.5.1
55
sphinx-design>=0.3.0
6-
sphinx-toolbox>=3.2.0
6+
sphinx-toolbox>=4.2.0

requirements/requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ scikit-learn>=1.2.0
2929
scipy>=1.8
3030
shapely>=2.0.0
3131
SimpleITK>=2.2.1
32-
sphinx>=5.3.0, <9.0.0
32+
simsimd>=6.5.16 # required by conda-package
33+
sphinx>=9.0.0
3334
tifffile>=2025.5.21
3435
timm>=1.0.3
3536
torch>=2.5.0

requirements/requirements_dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pytest>=7.2.0
1010
pytest-cov>=4.0.0
1111
pytest-runner>=6.0
1212
pytest-xdist[psutil]
13-
ruff==0.15.12 # This will be updated by pre-commit bot to latest version
13+
ruff==0.15.15 # This will be updated by pre-commit bot to latest version
1414
toml>=0.10.2
1515
twine>=4.0.1
1616
wheel>=0.37.1

tests/engines/test_semantic_segmentor.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ def test_semantic_segmentor_patches(
124124
processed_predictions=processed_predictions,
125125
output_type="annotationstore",
126126
save_path=output.with_suffix(".db"),
127+
class_dict=None,
127128
)
128129

129130
assert output_seg[0] == track_tmp_path / "output1" / (sample_image.stem + ".db")
@@ -245,6 +246,7 @@ def test_save_annotation_store_nparray(
245246
patch_mode=True,
246247
save_dir=track_tmp_path / "output1",
247248
output_type="annotationstore",
249+
class_dict=None,
248250
)
249251

250252
assert output[0] == track_tmp_path / "output1" / "0.db"
@@ -268,6 +270,7 @@ def test_save_annotation_store_nparray(
268270
patch_mode=True,
269271
save_dir=track_tmp_path / "output2",
270272
output_type="annotationstore",
273+
class_dict=None,
271274
)
272275

273276
assert output[0] == track_tmp_path / "output2" / "0.db"

0 commit comments

Comments
 (0)