setup-uv all the things

Author: A5rocks

.github/workflows/ci.yml

@@ -215,7 +215,6 @@ jobs:
         with:
           python-version: ${{ case(startsWith(matrix.python, 'pypy'), matrix.python, format('cpython-{0}', matrix.python)) }}-windows-${{ matrix.arch }}-none
           activate-environment: "true"
-      - run: uv pip install pip
       - name: Run tests
         run: ./ci.sh
         shell: bash
@@ -275,12 +274,10 @@ jobs:
         with:
           persist-credentials: false
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: astral-sh/setup-[email protected]
         with:
-          python-version: '${{ matrix.python }}'
-          cache: pip
-          cache-dependency-path: test-requirements.txt
-          allow-prereleases: true
+          python-version: ${{ matrix.python }}
+      - run: uv venv --system-site-packages
       - name: Setup minimum Python version
         if: matrix.check_formatting == '1'
         uses: actions/setup-python@v6
@@ -292,13 +289,14 @@ jobs:
       - name: Check Formatting
         if: matrix.check_formatting == '1'
         run:
-          python -m pip install tox &&
+          uv pip install tox &&
           tox -m check
       - name: Install python3-apport
         if: matrix.check_formatting == '0'
         run: |
-          sudo apt update
-          sudo apt install -q python3-apport
+          sudo apt update &&
+          sudo apt install -q python3-apport &&
+          uv run python -c "import apport_python_hook"  # double check it's installed!
       - name: Run tests
         if: matrix.check_formatting == '0'
         run: ./ci.sh
@@ -340,12 +338,10 @@ jobs:
           source-tarball-name: ${{ needs.build.outputs.sdist-artifact-name }}
           workflow-artifact-name: ${{ env.dists-artifact-name }}
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: astral-sh/setup-[email protected]
         with:
-          python-version: '${{ matrix.python }}'
-          cache: pip
-          cache-dependency-path: test-requirements.txt
-          allow-prereleases: true
+          python-version: ${{ matrix.python }}
+          activate-environment: "true"
       - name: Run tests
         run: ./ci.sh
       - if: always()
@@ -383,7 +379,7 @@ jobs:
         run: python -m venv .venv
 
       - name: Run tests
-        run: source .venv/bin/activate && ./ci.sh
+        run: source .venv/bin/activate && pip install uv && ./ci.sh
 
       - name: Get Python version for codecov flag
         id: get-version

ci.sh

@@ -33,28 +33,27 @@ function curl-harder() {
 ################################################################
 
 echo "::group::Versions"
-python -c "import sys, struct, ssl; print('python:', sys.version); print('version_info:', sys.version_info); print('bits:', struct.calcsize('P') * 8); print('openssl:', ssl.OPENSSL_VERSION, ssl.OPENSSL_VERSION_INFO)"
+uv run python -c "import sys, struct, ssl; print('python:', sys.version); print('version_info:', sys.version_info); print('bits:', struct.calcsize('P') * 8); print('openssl:', ssl.OPENSSL_VERSION, ssl.OPENSSL_VERSION_INFO)"
 echo "::endgroup::"
 
 echo "::group::Install dependencies"
-python -m pip install -U pip uv -c test-requirements.txt
-python -m pip --version
-python -m uv --version
+uv pip install -U uv -c test-requirements.txt
+uv --version
 
-python -m uv pip install build
+uv pip install build
 
-python -m build
+uv run -m build
 wheel_package=$(ls dist/*.whl)
-python -m uv pip install "trio @ $wheel_package" -c test-requirements.txt
+uv pip install "trio @ $wheel_package" -c test-requirements.txt
 
 # Actual tests
 # expands to 0 != 1 if NO_TEST_REQUIREMENTS is not set, if set the `-0` has no effect
 # https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_06_02
 if [ "${NO_TEST_REQUIREMENTS-0}" == 1 ]; then
-    python -m uv pip install pytest coverage -c test-requirements.txt
+    uv pip install pytest coverage -c test-requirements.txt
     flags="--skip-optional-imports"
 else
-    python -m uv pip install -r test-requirements.txt --no-deps
+    uv pip install -r test-requirements.txt --no-deps
     flags=""
 fi
 
@@ -111,7 +110,7 @@ echo "::group::Setup for tests"
 mkdir empty || true
 cd empty
 
-INSTALLDIR=$(python -c "import os, trio; print(os.path.dirname(trio.__file__))")
+INSTALLDIR=$(uv run python -c "import os, trio; print(os.path.dirname(trio.__file__))")
 cp ../pyproject.toml "$INSTALLDIR"  # TODO: remove this
 
 # get mypy tests a nice cache
@@ -125,7 +124,7 @@ perl -i -pe 's/-p trio\._tests\.pytest_plugin//' "$INSTALLDIR/pyproject.toml"
 echo "::endgroup::"
 echo "::group:: Run Tests"
 if PYTHONPATH=../tests COVERAGE_PROCESS_START=$(pwd)/../pyproject.toml \
-        coverage run --rcfile=../pyproject.toml -m \
+        uv run coverage run --rcfile=../pyproject.toml -m \
         pytest -ra --junitxml=../test-results.xml \
         -p _trio_check_attrs_aliases --verbose --durations=10 \
         -p trio._tests.pytest_plugin --run-slow $flags "${INSTALLDIR}"; then
@@ -136,11 +135,11 @@ fi
 echo "::endgroup::"
 echo "::group::Coverage"
 
-coverage combine --rcfile ../pyproject.toml
+uv run coverage combine --rcfile ../pyproject.toml
 cd ..  # coverage needs to be in the folder containing src/trio
 cp empty/.coverage .
-coverage report -m --rcfile ./pyproject.toml
-coverage xml --rcfile ./pyproject.toml
+uv run coverage report -m --rcfile ./pyproject.toml
+uv run coverage xml --rcfile ./pyproject.toml
 
 # Remove the LSP again; again we want to do this ASAP to avoid
 # accidentally breaking other stuff.

src/trio/_tests/test_exports.py

@@ -422,7 +422,11 @@ def lookup_symbol(symbol: str) -> dict[str, Any]:  # type: ignore[misc, explicit
             and BaseException in class_.__mro__
             and sys.version_info >= (3, 11)
         ):
-            missing.remove("add_note")
+            try:
+                missing.remove("add_note")
+            except KeyError:
+                print(f"failed to remove add_note for {class_!r}")
+                raise
 
         if (
             tool == "mypy"