Use python-version in setup-uv GitHub action and Consolidate CI steps (#999)

nathanjmcdougall · web-flow · commit 06cc0fc00b9c · 2025-10-14T06:20:43.000+13:00
* Use `python-version` in setup-uv GitHub action and Consolidate CI steps

* Override UV_PYTHON for the test suite
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,24 +43,14 @@ jobs:
         with:
           version: ${{ matrix.uv_version || 'latest' }}
           enable-cache: true
-
-      - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
-        with:
           python-version: ${{ matrix.python_version }}
 
-      - name: Bump dependencies
-        if: ${{ matrix.dependencies == 'max' }}
-        run: |
-          uv sync --upgrade
-
       - name: Setup dependencies
         run: |
-          uv python pin $CI_PYTHON_VERSION
-          uv sync
+          uv sync $CI_UV_UPGRADE_ARG
         env:
+          CI_UV_UPGRADE_ARG: ${{ matrix.dependencies == 'max' && '--upgrade' || '' }}
           UV_RESOLUTION: ${{ matrix.dependencies == 'min' && 'lowest-direct' || 'highest' }}
-          CI_PYTHON_VERSION: ${{ matrix.python_version }}
 
       - name: Run prek
         if: ${{ matrix.pre_commit == null || matrix.pre_commit == 'true' }}
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,3 +1,4 @@
+import os
 import shutil
 from collections.abc import Generator
 from enum import Enum
@@ -9,6 +10,11 @@
 from usethis._integrations.backend.uv.call import call_subprocess, call_uv_subprocess
 from usethis._test import change_cwd, is_offline
 
+if "UV_PYTHON" in os.environ:
+    # To allow test subprocesses to use different versions of Python than the one
+    # running the tests.
+    del os.environ["UV_PYTHON"]
+
 
 @pytest.fixture(scope="session")
 def _uv_init_dir(tmp_path_factory: pytest.TempPathFactory) -> Path:
