From 3e3361f229f73447d797040ddad3b099cb5fd7f2 Mon Sep 17 00:00:00 2001
From: Hynek Schlawack <hs@ox.cx>
Date: Wed, 18 Sep 2024 13:04:30 +0200
Subject: [PATCH 1/3] Fix CI for prereleases

---
 .github/workflows/ci.yml | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3795b9c4..9866f15f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,9 +51,12 @@ jobs:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
       - uses: hynek/setup-cached-uv@v2
-      - run: uv pip install --system tox-uv
 
-      - run: python -Im tox run --installpkg dist/*.whl -f py$(echo ${{ matrix.python-version }} | tr -d .)
+      - run: >
+          uvx --with=tox-uv
+          tox run
+          --installpkg dist/*.whl
+          -f py$(echo ${{ matrix.python-version }} | tr -d .)
 
       - name: Upload coverage data
         uses: actions/upload-artifact@v4
@@ -115,9 +118,12 @@ jobs:
           python-version-file: .python-version-default
           allow-prereleases: true
       - uses: hynek/setup-cached-uv@v2
-      - run: uv pip install --system tox-uv
 
-      - run: python -Im tox run --installpkg dist/*.whl -e mypy-pkg
+      - run: >
+          uvx --with=tox-uv
+          tox run
+          --installpkg dist/*.whl \
+          -e mypy-pkg
 
   pyright:
     name: Pyright
@@ -136,9 +142,12 @@ jobs:
           python-version-file: .python-version-default
           allow-prereleases: true
       - uses: hynek/setup-cached-uv@v2
-      - run: uv pip install --system tox-uv
 
-      - run: python -Im tox run --installpkg dist/*.whl -e pyright
+      - run: >
+          uvx --with=tox-uv
+          tox run
+          --installpkg dist/*.whl
+          -e pyright
 
   docs:
     name: Build docs & run doctests
@@ -156,9 +165,11 @@ jobs:
           # Keep in sync with tox.ini/docs & .readthedocs.yaml
           python-version: "3.12"
       - uses: hynek/setup-cached-uv@v2
-      - run: uv pip install --system tox-uv
 
-      - run: python -Im tox run -e docs
+      - run: >
+          uvx --with=tox-uv
+          tox run
+          -e docs
 
   install-dev:
     name: Verify dev env
@@ -212,6 +223,8 @@ jobs:
         with:
           python-version-file: .python-version-default
       - uses: hynek/setup-cached-uv@v2
-      - run: uv pip install --system tox-uv
 
-      - run: python -Im tox run -f color
+      - run: >
+          uvx --with=tox-uv
+          tox run
+          -f color

From b83f92f9ba0bbbebce9559079ecc410e976411b3 Mon Sep 17 00:00:00 2001
From: Hynek Schlawack <hs@ox.cx>
Date: Wed, 18 Sep 2024 13:05:41 +0200
Subject: [PATCH 2/3] Use uv tool for coverage

---
 .github/workflows/ci.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9866f15f..bb9925ce 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,14 +85,16 @@ jobs:
 
       - name: Combine coverage & fail if it's <100%.
         run: |
-          python -Im coverage combine
-          python -Im coverage html --skip-covered --skip-empty
+          uv tool install 'coverage[toml]'
+
+          coverage combine
+          coverage html --skip-covered --skip-empty
 
           # Report and write to summary.
-          python -Im coverage report --format=markdown >> $GITHUB_STEP_SUMMARY
+          coverage report --format=markdown >> $GITHUB_STEP_SUMMARY
 
           # Report again and fail if under 100%.
-          python -Im coverage report --fail-under=100
+          coverage report --fail-under=100
 
       - name: Upload HTML report if check failed.
         uses: actions/upload-artifact@v4

From e651bf58d9e572db39c7bbc490d0a2b9b2b50fcf Mon Sep 17 00:00:00 2001
From: Hynek Schlawack <hs@ox.cx>
Date: Wed, 18 Sep 2024 13:12:01 +0200
Subject: [PATCH 3/3] typo

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bb9925ce..8fd4e416 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -124,7 +124,7 @@ jobs:
       - run: >
           uvx --with=tox-uv
           tox run
-          --installpkg dist/*.whl \
+          --installpkg dist/*.whl
           -e mypy-pkg
 
   pyright: