From 4e1dd11b4b91da10acb8a38af09b99069b4b0563 Mon Sep 17 00:00:00 2001 From: Tariq Bashir Date: Mon, 29 Jun 2026 19:49:42 +0100 Subject: [PATCH] fix(chromium-patches): refresh vpython wheel pins for AR Patch apply and hook setup started failing because old wheel pins in .vpython3 no longer resolve cleanly through current vpython/pip + AR. What changed Added fix_vpython_wheel_pins_for_artifact_registry.patch. Registered it in patches/chromium/.patches. Updated pins in .vpython3: numpy: 1.2x.supported.1 -> 1.20.supported.2 pathos: 0.2.7.chromium.5 -> 0.2.7.chromium.6 Why numpy pin was being transformed into an invalid requirement form. pathos .5 pin is no longer available in Artifact Registry. Direct edits under src are reset by sync, so this must live in the Chromium patch pipeline. Scope note An initial catapult hunk was dropped because third_party/catapult/.vpython3 is absent in this branch index. Result gclient sync + patch apply now complete. vpython bootstrap proceeds with available pinned wheel versions. --- patches/chromium/.patches | 1 + ...hon_wheel_pins_for_artifact_registry.patch | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 patches/chromium/fix_vpython_wheel_pins_for_artifact_registry.patch diff --git a/patches/chromium/.patches b/patches/chromium/.patches index b1e13994632f1..55b7b634dedf2 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -222,3 +222,4 @@ ozone_nexus_assign_virtualkeyboard_role_to_overlay_windows_os-20973.patch brightsign_fix_semi-transparent_window_opacity_not_rendering_on.patch brightsign_fix_black_transparent_hole_being_shown_before_video.patch brightsign_missing_check_for_isstartingstylerule_in_allowfrom.patch +fix_vpython_wheel_pins_for_artifact_registry.patch diff --git a/patches/chromium/fix_vpython_wheel_pins_for_artifact_registry.patch b/patches/chromium/fix_vpython_wheel_pins_for_artifact_registry.patch new file mode 100644 index 0000000000000..90e3630a0b597 --- /dev/null +++ b/patches/chromium/fix_vpython_wheel_pins_for_artifact_registry.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: BrightSign CI +Date: Mon, 29 Jun 2026 16:25:00 +0100 +Subject: fix: update vpython wheel pins for Artifact Registry + +Use currently available wheel versions in Chrome Python Artifact Registry. + +- numpy: 1.2x.supported.1 -> 1.20.supported.2 +- pathos: 0.2.7.chromium.5 -> 0.2.7.chromium.6 + +diff --git a/.vpython3 b/.vpython3 +--- a/.vpython3 ++++ b/.vpython3 +@@ -144,7 +144,7 @@ wheel: < + # Chromium tests using Telemetry function properly. + wheel: < + name: "infra/python/wheels/numpy/${vpython_platform}" +- version: "version:1.2x.supported.1" ++ version: "version:1.20.supported.2" + > + wheel: < + name: "infra/python/wheels/pexpect/${vpython_platform}" +@@ -476,7 +476,7 @@ wheel: < + # //content/test/gpu + wheel: < + name: "infra/python/wheels/pathos/${vpython_platform}" +- version: "version:0.2.7.chromium.5" ++ version: "version:0.2.7.chromium.6" + not_match_tag < + abi: "cp27mu" + platform: "manylinux1_i686"