Merge uv changes

filmor · filmor · commit d304d7fcd805 · 2025-10-11T13:14:55.000+02:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -59,32 +59,23 @@ jobs:
             8.0.x
             9.0.x
 
-      - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v6
+      - name: Install the latest version of uv
+        uses: astral-sh/setup-uv@v6
         with:
-          python-version: ${{ matrix.python }}
           architecture: ${{ matrix.os.platform }}
-
-      - name: Install dependencies
-        run: |
-          pip install --upgrade -r requirements.txt
-          pip install numpy # for tests
-
-      - name: Build and Install
-        run: |
-          pip install -v .
+          python-version: ${{ matrix.python }}
+          activate-environment: true
+          enable-cache: true
 
       - name: Set Python DLL path and PYTHONHOME (non Windows)
         if: ${{ matrix.os.category != 'windows' }}
         run: |
-          echo PYTHONNET_PYDLL=$(python -m find_libpython) >> $GITHUB_ENV
-          echo PYTHONHOME=$(python -c 'import sys; print(sys.prefix)') >> $GITHUB_ENV
+          echo PYTHONNET_PYDLL=$(uv run 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=$(python -m find_libpython)"
-          Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append -InputObject "PYTHONHOME=$(python -c 'import sys; print(sys.prefix)')"
+          Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append -InputObject "PYTHONNET_PYDLL=$(uv run find_libpython)"
 
       - name: Embedding tests
         run: dotnet test --runtime any-${{ matrix.os.platform }} --logger "console;verbosity=detailed" src/embed_tests/
@@ -105,4 +96,15 @@ jobs:
         run: pytest --runtime netfx
 
       - name: Python tests run from .NET
+<<<<<<< HEAD
         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
+          uv run dotnet test --configuration Release --runtime any-${{ matrix.os.platform }} --logger "console;verbosity=detailed" src/perf_tests/
+      # TODO: Run mono tests on Windows?
+>>>>>>> uv
diff --git a/tools/geninterop/geninterop.py b/tools/geninterop/geninterop.py
@@ -1,6 +1,7 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
+#!/usr/bin/env uv run
+# /// script
+# dependencies = ["pycparser"]
+# ///
 """
 TypeOffset is a C# class that mirrors the in-memory layout of heap
 allocated Python objects.
diff --git a/uv.lock b/uv.lock
