Skip to content

Commit 25c0258

Browse files
authored
Merge branch 'develop' into dep-update-sphinx
2 parents 3bec3e5 + 36ecfa6 commit 25c0258

20 files changed

Lines changed: 76 additions & 37 deletions

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ jobs:
3535
sudo apt update
3636
sudo apt-get install -y libopenslide-dev openslide-tools libopenjp2-7 libopenjp2-tools
3737
python -m pip install --upgrade pip
38-
pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu
39-
pip install -r requirements/requirements_dev.txt
38+
pip install uv
39+
uv pip install --system torch torchvision --index-url https://download.pytorch.org/whl/cpu
40+
uv pip install --system -r requirements/requirements_dev.txt
4041
4142
- name: Debug typing environment
4243
run: |

.github/workflows/pip-install.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ jobs:
4242
steps:
4343
- name: Checkout
4444
uses: actions/checkout@v4
45+
with:
46+
fetch-depth: 0
4547

4648
- name: Install Miniconda
4749
uses: conda-incubator/setup-miniconda@v3
@@ -122,14 +124,16 @@ jobs:
122124
run: |
123125
source $CONDA/etc/profile.d/conda.sh
124126
conda activate test-env
125-
pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu
127+
pip install uv
128+
uv pip install --system torch torchvision --index-url https://download.pytorch.org/whl/cpu
126129
127130
- name: Install CPU-only PyTorch (Windows)
128131
if: runner.os == 'Windows'
129132
shell: pwsh
130133
run: |
131134
conda activate test-env
132-
pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu
135+
pip install uv
136+
uv pip install --system torch torchvision --index-url https://download.pytorch.org/whl/cpu
133137
134138
# -------------------------------
135139
# (Windows only) make console UTF-8 (extra safety)
@@ -151,14 +155,22 @@ jobs:
151155
run: |
152156
source $CONDA/etc/profile.d/conda.sh
153157
conda activate test-env
154-
pip install git+https://github.com/TissueImageAnalytics/tiatoolbox@${GITHUB_SHA}
158+
pip install uv
159+
if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
160+
REF="${{ github.event.pull_request.head.sha }}"
161+
else
162+
REF="${GITHUB_SHA}"
163+
fi
164+
echo "Installing tiatoolbox at ref: $REF"
165+
uv pip install --system git+https://github.com/TissueImageAnalytics/tiatoolbox@$REF
155166
156167
- name: Install tiatoolbox (Windows)
157168
if: runner.os == 'Windows'
158169
shell: pwsh
159170
run: |
160171
conda activate test-env
161-
pip install git+https://github.com/TissueImageAnalytics/tiatoolbox@$env:GITHUB_SHA
172+
pip install uv
173+
uv pip install --system git+https://github.com/TissueImageAnalytics/tiatoolbox@$env:GITHUB_SHA
162174
163175
# -------------------------------
164176
# Test Imports

.github/workflows/python-package.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ jobs:
3434
sudo apt-get install -y libopenjp2-7 libopenjp2-tools
3535
python -m pip install --upgrade pip
3636
python -m pip install ruff==0.15.9 pytest pytest-cov pytest-runner
37-
pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu
38-
pip install -r requirements/requirements.txt
37+
pip install uv
38+
uv pip install --system torch torchvision --index-url https://download.pytorch.org/whl/cpu
39+
uv pip install --system -r requirements/requirements.txt
3940
- name: Cache tiatoolbox static assets
4041
uses: actions/cache@v4
4142
with:
@@ -111,9 +112,10 @@ jobs:
111112
run: |
112113
sudo apt-get install -y libopenslide-dev libopenjp2-7
113114
python -m pip install --upgrade pip
114-
pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu
115-
pip install -r requirements/requirements.txt
116-
pip install build
115+
pip install uv
116+
uv pip install --system torch torchvision --index-url https://download.pytorch.org/whl/cpu
117+
uv pip install --system -r requirements/requirements.txt
118+
uv pip install --system build
117119
- name: Build package
118120
run: python -m build
119121

docs/installation.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,16 @@ or
115115
116116
An alternate way to install using conda on Windows could be to install it in `WSL2 with CUDA support <https://learn.microsoft.com/en-us/windows/ai/directml/gpu-cuda-in-wsl>`_. Depending on your hardware and workload, WSL2 may offer improved performance for some Python workflows, and therefore we **recommend** this option.
117117

118+
Using uv
119+
--------
120+
121+
To install using `uv <https://docs.astral.sh/uv/>`_, a fast Python package and project manager, written in Rust.
122+
123+
.. code-block:: console
124+
125+
$ pip install uv
126+
$ uv pip install tiatoolbox
127+
118128
From Sources
119129
------------
120130

examples/01-wsi-reading.ipynb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@
7474
"source": [
7575
"%%bash\n",
7676
"apt-get -y install libopenjp2-7-dev libopenjp2-tools libpixman-1-dev | tail -n 1\n",
77-
"pip install git+https://github.com/TissueImageAnalytics/tiatoolbox.git@develop | tail -n 1\n",
77+
"pip install uv\n",
78+
"uv pip install git+https://github.com/TissueImageAnalytics/tiatoolbox.git@develop | tail -n 1\n",
7879
"echo \"Installation is done.\""
7980
]
8081
},

examples/02-stain-normalization.ipynb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@
8383
"source": [
8484
"%%bash\n",
8585
"apt-get -y install libopenjp2-7-dev libopenjp2-tools libpixman-1-dev | tail -n 1\n",
86-
"pip install git+https://github.com/TissueImageAnalytics/tiatoolbox.git@develop | tail -n 1\n",
86+
"pip install uv\n",
87+
"uv pip install git+https://github.com/TissueImageAnalytics/tiatoolbox.git@develop | tail -n 1\n",
8788
"echo \"Installation is done.\""
8889
]
8990
},

examples/03-tissue-masking.ipynb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@
7373
"source": [
7474
"%%bash\n",
7575
"apt-get -y install libopenjp2-7-dev libopenjp2-tools libpixman-1-dev | tail -n 1\n",
76-
"pip install git+https://github.com/TissueImageAnalytics/tiatoolbox.git@develop | tail -n 1\n",
76+
"pip install uv\n",
77+
"uv pip install git+https://github.com/TissueImageAnalytics/tiatoolbox.git@develop | tail -n 1\n",
7778
"echo \"Installation is done.\""
7879
]
7980
},

0 commit comments

Comments
 (0)