Remove some cruft from ipcz standalone support
Removes unnecessary DEPS entry for old vpython 2, and removes unused
wheels from the vpython3 config.
Bug: None
Change-Id: I4e96d0a3b396e6e8107d71d9392f7af40e60c077
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4283557
Reviewed-by: Alex Gough <ajgo@chromium.org>
Commit-Queue: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/main@{#1108664}
NOKEYCHECK=True
GitOrigin-RevId: 6e97e2b4daec8887d708bcc38a51cf3b9683b3bd
diff --git a/.vpython3 b/.vpython3
index ba611ca..fa5a7d0 100644
--- a/.vpython3
+++ b/.vpython3
@@ -37,47 +37,3 @@
{python: "cp38", abi: "cp38", platform: "win32"},
{python: "cp38", abi: "cp38", platform: "win_amd64"}
]
-
-# TODO(https://crbug.com/898348): Add in necessary wheels as Python3 versions
-# become available.
-wheel: <
- name: "infra/python/wheels/six-py2_py3"
- version: "version:1.15.0"
->
-
-# Common utilities.
-# Use the same versions specified by //third_party/catapult/.vpython3 so that
-# Chromium tests using Telemetry function properly.
-wheel: <
- name: "infra/python/wheels/numpy/${vpython_platform}"
- version: "version:1.2x.supported.1"
->
-wheel: <
- name: "infra/python/wheels/pexpect/${vpython_platform}"
- version: "version:4.8.0.chromium.1"
->
-wheel: <
- name: "infra/python/wheels/psutil/${vpython_platform}"
- version: "version:5.8.0.chromium.3"
->
-wheel: <
- name: "infra/python/wheels/requests-py2_py3"
- version: "version:2.26.0"
->
-wheel: <
- name: "infra/python/wheels/pillow/${vpython_platform}"
- version: "version:8.3.1"
- # There is currently no Linux arm/arm64 version in CIPD.
- not_match_tag <
- platform: "linux_aarch64"
- >
->
-wheel: <
- name: "infra/python/wheels/opencv_python/${vpython_platform}"
- version: "version:4.5.3.56.chromium.4"
- # There is currently no Linux arm/arm64 version in CIPD.
- not_match_tag <
- platform: "linux_aarch64"
- >
->
-
diff --git a/DEPS b/DEPS
index 17747c9..0ac388d 100644
--- a/DEPS
+++ b/DEPS
@@ -104,20 +104,6 @@
hooks = [
# Download and initialize "vpython" VirtualEnv environment packages for
- # Python2. We do this before running any other hooks so that any other
- # hooks that might use vpython don't trip over unexpected issues and
- # don't run slower than they might otherwise need to.
- {
- 'name': 'vpython_common',
- 'pattern': '.',
- # TODO(https://crbug.com/1205263): Run this on mac/arm too once it works.
- 'condition': 'not (host_os == "mac" and host_cpu == "arm64")',
- 'action': [ 'vpython',
- '-vpython-spec', '.vpython',
- '-vpython-tool', 'install',
- ],
- },
- # Download and initialize "vpython" VirtualEnv environment packages for
# Python3. We do this before running any other hooks so that any other
# hooks that might use vpython don't trip over unexpected issues and
# don't run slower than they might otherwise need to.
