Use uv

filmor · filmor · commit 1a5ca7c881f1 · 2025-04-14T20:28:37.000+02:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -37,7 +37,7 @@ jobs:
         # This fails in pytest with:
         # CSC : error CS4023: /platform:anycpu32bitpreferred can only be used with /t:exe, /t:winexe and /t:appcontainerexe [D:\a\pythonnet\pythonnet\src\runtime\Python.Runtime.csproj]
         exclude:
-          - os: 
+          - os:
               category: windows
               platform: x86
             python: "3.13"
@@ -58,8 +58,10 @@ jobs:
           dotnet-version: '6.0.x'
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v4
         with:
+          architecture: ${{ matrix.os.platform }}
+          python-version: ${{ matrix.python }}
           enable-cache: true
 
       - name: Install dependencies
@@ -70,42 +72,37 @@ jobs:
       - name: Set Python DLL path and PYTHONHOME (non Windows)
         if: ${{ matrix.os.category != 'windows' }}
         run: |
-          echo PYTHONNET_PYDLL=$(uv run find_libpython) >> $GITHUB_ENV
-          echo PYTHONHOME=$(uv run python -c 'import sys; print(sys.prefix)') >> $GITHUB_ENV
+          echo PYTHONNET_PYDLL=$(uv run python -m find_libpython) >> $GITHUB_ENV
 
       - name: Set Python DLL path and PYTHONHOME (Windows)
         if: ${{ matrix.os.category == 'windows' }}
         run: |
-          Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append -InputObject "PYTHONNET_PYDLL=$(uv run find_libpython)"
-          Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append -InputObject "PYTHONHOME=$(uv run python -c 'import sys; print(sys.prefix)')"
+          Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append -InputObject "PYTHONNET_PYDLL=$(uv run python -m find_libpython)"
 
       - name: Embedding tests
-        if: ${{ matrix.python != '3.13' }}
-        run: dotnet test --runtime any-${{ matrix.os.platform }} --logger "console;verbosity=detailed" src/embed_tests/
+        run: uv run dotnet test --runtime any-${{ matrix.os.platform }} --logger "console;verbosity=detailed" src/embed_tests/
         env:
           MONO_THREADS_SUSPEND: preemptive # https://github.com/mono/mono/issues/21466
 
       - name: Python Tests (Mono)
         if: ${{ matrix.os.category != 'windows' }}
-        run: uv run pytest --runtime mono
+        run: uv run python -m pytest --runtime mono
 
       # TODO: Run these tests on Windows x86
       - name: Python Tests (.NET Core)
         if: ${{ matrix.os.platform == 'x64' }}
-        run: uv run pytest --runtime coreclr
+        run: uv run python -m pytest --runtime coreclr
 
       - name: Python Tests (.NET Framework)
         if: ${{ matrix.os.category == 'windows' }}
-        run: uv run pytest --runtime netfx
+        run: uv run python -m pytest --runtime netfx
 
       - name: Python tests run from .NET
-        if: ${{ matrix.python != '3.13' }}
-        run: dotnet test --runtime any-${{ matrix.os.platform }} src/python_tests_runner/
+        run: uv run dotnet test --runtime any-${{ matrix.os.platform }} src/python_tests_runner/
 
       - name: Perf tests
         if: ${{ (matrix.python == '3.8') && (matrix.os.platform == 'x64') }}
         run: |
           uv pip install --force --no-deps --target src/perf_tests/baseline/ pythonnet==2.5.2
-          dotnet test --configuration Release --runtime any-${{ matrix.os.platform }} --logger "console;verbosity=detailed" src/perf_tests/
-
+          uv run dotnet test --configuration Release --runtime any-${{ matrix.os.platform }} --logger "console;verbosity=detailed" src/perf_tests/
       # TODO: Run mono tests on Windows?
