Skip to content

Commit 21aa543

Browse files
authored
Merge branch 'develop' into dev-add-python3.14
2 parents 7dc2761 + 9d5abca commit 21aa543

29 files changed

Lines changed: 870 additions & 294 deletions

.github/workflows/mypy-type-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
4848
- name: Perform type checking
4949
run: |
50-
mypy --install-types --non-interactive --follow-imports=silent \
50+
mypy --install-types --non-interactive --follow-imports=skip --ignore-missing-imports \
5151
tiatoolbox/__init__.py \
5252
tiatoolbox/__main__.py \
5353
tiatoolbox/type_hints.py \

.github/workflows/pip-install.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
shell: bash
6161
run: |
6262
source $CONDA/etc/profile.d/conda.sh
63-
conda create -y -n test-env python=${{ matrix.python-version }}
63+
conda create -y -n test-env python=${{ matrix.python-version }} pip
6464
conda activate test-env
6565
conda install -y openjpeg sqlite
6666
python -m pip install --upgrade pip setuptools wheel
@@ -72,7 +72,7 @@ jobs:
7272
if: runner.os == 'Windows'
7373
shell: pwsh
7474
run: |
75-
conda create -y -n test-env python=${{ matrix.python-version }}
75+
conda create -y -n test-env python=${{ matrix.python-version }} pip
7676
conda activate test-env
7777
conda install -y openjpeg sqlite
7878
python -m pip install --upgrade pip setuptools wheel

.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.9 pytest pytest-cov pytest-runner
36+
python -m pip install ruff==0.15.12 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.9
63+
rev: v0.15.12
6464
hooks:
6565
- id: ruff
6666
args: [--fix, --exit-non-zero-on-fix]

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.9 # This will be updated by pre-commit bot to latest version
13+
ruff==0.15.12 # 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

0 commit comments

Comments
 (0)