Merge pull request 'Fix macOS CI and remove duplicate GitHub Actions workflow' (#4) from perf/pipeline-improvements into main

Reviewed-on: #4

.gitea/workflows/build.yml

@@ -32,15 +32,19 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install uv
-        uses: astral-sh/setup-uv@v4
-
       - name: Set up Python
-        run: uv python install ${{ env.PYTHON_VERSION }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+        env:
+          AGENT_TOOLSDIRECTORY: ${{ runner.temp }}/toolcache
+
+      - name: Install Python build tools
+        run: python -m pip install --upgrade pip setuptools wheel
 
       - name: Build sidecar
         working-directory: python
-        run: uv run --python ${{ env.PYTHON_VERSION }} python build_sidecar.py --cpu-only
+        run: python build_sidecar.py --cpu-only
 
       - name: Upload sidecar artifact
         uses: actions/upload-artifact@v3

python/build_sidecar.py

@@ -59,67 +59,42 @@ def get_target_triple() -> str:
         return f"{arch}-unknown-{system}"
 
 
-def _has_uv() -> bool:
-    """Check if uv is available."""
-    try:
-        subprocess.run(["uv", "--version"], capture_output=True, check=True)
-        return True
-    except (FileNotFoundError, subprocess.CalledProcessError):
-        return False
-
-
 def create_venv_and_install(cpu_only: bool) -> Path:
-    """Create a fresh venv and install dependencies.
+    """Create a fresh venv and install dependencies."""
-
-    Uses uv if available (much faster), falls back to standard venv + pip.
-    """
     venv_dir = BUILD_DIR / "sidecar-venv"
     if venv_dir.exists():
         shutil.rmtree(venv_dir)
 
-    use_uv = _has_uv()
-
-    if use_uv:
-        print(f"[build] Creating venv with uv at {venv_dir}")
-        subprocess.run(
-            ["uv", "venv", "--python", f"{sys.version_info.major}.{sys.version_info.minor}",
-             str(venv_dir)],
-            check=True,
-        )
-    else:
     print(f"[build] Creating venv at {venv_dir}")
     subprocess.run([sys.executable, "-m", "venv", str(venv_dir)], check=True)
 
-    # Determine python path inside venv
+    # Determine python path inside venv — use `python -m pip` instead of
+    # calling pip directly to avoid permission errors on Windows
     if sys.platform == "win32":
         python = str(venv_dir / "Scripts" / "python")
     else:
         python = str(venv_dir / "bin" / "python")
 
-    def pkg_install(*args: str) -> None:
+    def pip_install(*args: str) -> None:
-        if use_uv:
-            subprocess.run(["uv", "pip", "install", "--python", python, *args], check=True)
-        else:
         subprocess.run([python, "-m", "pip", *args], check=True)
 
-    if not use_uv:
+    # Upgrade pip
-        # Upgrade pip (uv doesn't need this)
+    pip_install("install", "--upgrade", "pip", "setuptools", "wheel")
-        pkg_install("install", "--upgrade", "pip", "setuptools", "wheel")
 
     # Install torch (CPU-only to avoid bundling ~2GB of CUDA libs)
     if cpu_only:
         print("[build] Installing PyTorch (CPU-only)")
-        pkg_install(
+        pip_install(
             "install", "torch", "torchaudio",
             "--index-url", "https://download.pytorch.org/whl/cpu",
         )
     else:
         print("[build] Installing PyTorch (default, may include CUDA)")
-        pkg_install("install", "torch", "torchaudio")
+        pip_install("install", "torch", "torchaudio")
 
     # Install project and dev deps (includes pyinstaller)
     print("[build] Installing project dependencies")
-    pkg_install("install", "-e", f"{SCRIPT_DIR}[dev]")
+    pip_install("install", "-e", f"{SCRIPT_DIR}[dev]")
 
     return Path(python)