From 9ae76265ba8100cace0ac7e0c833de36a7383f8b Mon Sep 17 00:00:00 2001 From: Michael Cahill Date: Sat, 7 Mar 2026 15:38:39 -0800 Subject: [PATCH] M01: Add --no-build-isolation to clip install in launch_utils Fixes pkg_resources in pip's isolated build env. Build-time fix only. Made-with: Cursor --- .github/workflows/run_tests.yaml | 1 - docs/milestones/M01/M01_plan.md | 2 +- docs/milestones/M01/M01_toolcalls.md | 3 ++- modules/launch_utils.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml index 3b7629cef..7072bc927 100644 --- a/.github/workflows/run_tests.yaml +++ b/.github/workflows/run_tests.yaml @@ -43,7 +43,6 @@ jobs: env: PIP_DISABLE_PIP_VERSION_CHECK: "1" PIP_PROGRESS_BAR: "off" - PIP_NO_BUILD_ISOLATION: "1" TORCH_INDEX_URL: https://download.pytorch.org/whl/cpu WEBUI_LAUNCH_LIVE_OUTPUT: "1" PYTHONUNBUFFERED: "1" diff --git a/docs/milestones/M01/M01_plan.md b/docs/milestones/M01/M01_plan.md index 32ba31325..683c4c669 100644 --- a/docs/milestones/M01/M01_plan.md +++ b/docs/milestones/M01/M01_plan.md @@ -16,7 +16,7 @@ Stabilize CI before any refactor work begins. Make CI a trustworthy signal for s ## Scope -1. **Fix CI environment failure** — CLIP/pkg_resources: install setuptools before env setup; add `--do-not-download-clip` to setup step +1. **Fix CI environment failure** — CLIP/pkg_resources: install setuptools before env setup; add `--no-build-isolation` to clip pip install in launch_utils (avoids isolated build env lacking pkg_resources) 2. **Ensure CI runs on all PRs** — Remove same-repo PR skip condition from both workflows 3. **Introduce smoke validation** — Fast startup check before full test suite 4. **Add minimal coverage gate** — `--cov-fail-under=60` diff --git a/docs/milestones/M01/M01_toolcalls.md b/docs/milestones/M01/M01_toolcalls.md index b22a708d6..87e2c2ab6 100644 --- a/docs/milestones/M01/M01_toolcalls.md +++ b/docs/milestones/M01/M01_toolcalls.md @@ -10,4 +10,5 @@ | 2025-03-07 | write | Create .gitattributes | .gitattributes | done | | 2025-03-07 | search_replace | Update milestone ledger | docs/serena.md | done | | 2025-03-07 | run | git push, CI run 22809624907 | Tests failed at Setup env (CLIP pkg_resources) | done | -| 2025-03-07 | search_replace | Add PIP_NO_BUILD_ISOLATION for CLIP build | .github/workflows/run_tests.yaml | in_progress | +| 2025-03-07 | search_replace | Add PIP_NO_BUILD_ISOLATION for CLIP build | .github/workflows/run_tests.yaml | done (reverted - env not passed to pip subprocess) | +| 2025-03-07 | search_replace | Add --no-build-isolation to clip install in launch_utils | modules/launch_utils.py | done | diff --git a/modules/launch_utils.py b/modules/launch_utils.py index 20c7dc127..bc8231c85 100644 --- a/modules/launch_utils.py +++ b/modules/launch_utils.py @@ -391,7 +391,7 @@ def prepare_environment(): startup_timer.record("torch GPU test") if not is_installed("clip"): - run_pip(f"install {clip_package}", "clip") + run_pip(f"install {clip_package} --no-build-isolation", "clip") startup_timer.record("install clip") if not is_installed("open_clip"):