Skip to content

Commit 113fb6b

Browse files
authored
Merge branch 'dev-define-engines-abc' into dev-define-semantic-segmentor
2 parents 193c587 + 1fccf15 commit 113fb6b

35 files changed

+6491
-5426
lines changed

.github/workflows/python-package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
sudo apt update
3131
sudo apt-get install -y libopenslide-dev openslide-tools libopenjp2-7 libopenjp2-tools
3232
python -m pip install --upgrade pip
33-
python -m pip install ruff==0.6.5 pytest pytest-cov pytest-runner
33+
python -m pip install ruff==0.7.4 pytest pytest-cov pytest-runner
3434
pip install -r requirements/requirements.txt
3535
- name: Cache tiatoolbox static assets
3636
uses: actions/cache@v3
@@ -58,7 +58,7 @@ jobs:
5858
- name: Test with pytest
5959
run: |
6060
pytest --basetemp={envtmpdir} \
61-
--cov=tiatoolbox --cov-report=term --cov-report=xml \
61+
--cov=tiatoolbox --cov-report=term --cov-report=xml --cov-config=pyproject.toml \
6262
--capture=sys \
6363
--durations=10 --durations-min=1.0 \
6464
--maxfail=1

.pre-commit-config.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ci:
22
autofix_prs: true
3-
autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate'
4-
autoupdate_schedule: 'weekly'
3+
autoupdate_commit_msg: ':technologist: pre-commit autoupdate'
4+
autoupdate_schedule: 'monthly'
55
repos:
66
- repo: local
77
hooks:
@@ -11,7 +11,7 @@ repos:
1111
files: tests/.*\btest_\w*.py
1212
require_serial: true
1313
language: system
14-
stages: [push]
14+
stages: [pre-push]
1515
- id: notebook-markdown-format
1616
name: notebook markdown format
1717
entry: python pre-commit/notebook_markdown_format.py
@@ -23,15 +23,15 @@ repos:
2323
- mdformat-black
2424
- mdformat-myst
2525
- repo: https://github.com/executablebooks/mdformat
26-
rev: 0.7.17
26+
rev: 0.7.18
2727
hooks:
2828
- id: mdformat
2929
# Optionally add plugins
3030
additional_dependencies:
3131
- mdformat-gfm # GitHub flavoured markdown
3232
- mdformat-black # Black formatting for python verbatim blocks
3333
- repo: https://github.com/pre-commit/pre-commit-hooks
34-
rev: v4.6.0
34+
rev: v5.0.0
3535
hooks:
3636
- id: check-ast # Simply checks whether the files parse as valid Python.
3737
- id: fix-byte-order-marker # Removes utf-8 byte order marker.
@@ -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.6.5
63+
rev: v0.7.4
6464
hooks:
6565
- id: ruff
6666
args: [--fix, --exit-non-zero-on-fix]

CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ authors:
2424
orcid: "https://orcid.org/0000-0003-0969-2990"
2525
- family-names: "Bashir"
2626
given-names: "Raja Muhammad Saad"
27-
orcid: "https://orcid.org/0000-0002-8984-696"
27+
orcid: "https://orcid.org/0000-0002-8984-6963"
2828
- family-names: "Bilal"
2929
given-names: "Mohsin"
3030
orcid: "https://orcid.org/0000-0001-8632-2729"
@@ -74,7 +74,7 @@ preferred-citation:
7474
orcid: "https://orcid.org/0000-0003-0969-2990"
7575
- family-names: "Bashir"
7676
given-names: "Raja Muhammad Saad"
77-
orcid: "https://orcid.org/0000-0002-8984-696"
77+
orcid: "https://orcid.org/0000-0002-8984-6963"
7878
- family-names: "Bilal"
7979
given-names: "Mohsin"
8080
orcid: "https://orcid.org/0000-0001-8632-2729"

examples/03-tissue-masking.ipynb

Lines changed: 57 additions & 29 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)