Make GPU tests Python 3 compatible
Makes the necessary changes to make the GPU Telemetry-based integration
tests fully Python 3-compatible. This has been tested on the bots, but
this CL does not actually enable use of Python 3 since we want to
verify that important functionality (such as minidump symbolization)
works properly before switching all testing to Python 3.
Bug: 1198237
Change-Id: I377ddea05421ee524fcb104ef17a06b208c96ce8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2976737
Auto-Submit: Brian Sheedy <[email protected]>
Commit-Queue: Brian Sheedy <[email protected]>
Reviewed-by: Robbie Iannucci <[email protected]>
Reviewed-by: Dirk Pranke <[email protected]>
Reviewed-by: Yuly Novikov <[email protected]>
Cr-Commit-Position: refs/heads/main@{#924578}
diff --git a/.vpython3 b/.vpython3
index fc530f6..45fd1b7 100644
--- a/.vpython3
+++ b/.vpython3
@@ -54,14 +54,11 @@
>
# Common utilities.
-# For Python 2, this version needed to be compatible with the version range
-# specified by
-# //third_party/catapult/telemetry/telemetry/internal/util/external_modules.py
-# However, the hope is that Telemetry's Python 3 migration will fix this, so
-# use the newer version that's currently available in CIPD for now.
+# 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.19.5"
+ version: "version:1.20.3"
>
wheel: <
name: "infra/python/wheels/psutil/${vpython_platform}"
@@ -286,3 +283,13 @@
platform: "win_amd64"
>
>
+
+# Used by:
+# //content/test/gpu/gpu_tests/color_profile_manager_mac.py
+wheel: <
+ name: "infra/python/wheels/pyobjc/${vpython_platform}"
+ version: "version:7.3.chromium.1"
+ match_tag: <
+ platform: "macosx_10_10_intel"
+ >
+>
