Skip to content

Commit

Permalink
Add mac-arm64 to chromium/src vpython validation.
Browse files Browse the repository at this point in the history
Update pathos wheel version to one that exists for mac-arm64.

Bug: 1235841
Change-Id: I2b400014059d476370fa0bc0873a80035885e937
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3163748
Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Brian Ryner <bryner@google.com>
Commit-Queue: Brian Ryner <bryner@google.com>
Cr-Commit-Position: refs/heads/main@{#922144}
  • Loading branch information
brianryner8 authored and Chromium LUCI CQ committed Sep 16, 2021
1 parent 24821f3 commit f82bfc2
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 1 deletion.
17 changes: 16 additions & 1 deletion .vpython
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,21 @@

python_version: "2.7"

# The default set of platforms vpython checks does not yet include mac-arm64.
# Setting `verify_pep425_tag` to the list of platforms we explicitly must support
# allows us to ensure that vpython specs stay mac-arm64-friendly
verify_pep425_tag: [
{python: "cp27", abi: "cp27mu", platform: "manylinux1_x86_64"},
{python: "cp27", abi: "cp27mu", platform: "linux_arm64"},
{python: "cp27", abi: "cp27mu", platform: "linux_armv6l"},

{python: "cp27", abi: "cp27m", platform: "macosx_10_10_intel"},
{python: "cp27", abi: "cp27m", platform: "macosx_11_0_arm64"},

{python: "cp27", abi: "cp27m", platform: "win32"},
{python: "cp27", abi: "cp27m", platform: "win_amd64"}
]

# Used by:
# build/chromeos/test_runner.py
wheel: <
Expand Down Expand Up @@ -394,7 +409,7 @@ wheel: <
# //content/test/gpu
wheel: <
name: "infra/python/wheels/pathos/${vpython_platform}"
version: "version:0.2.7.chromium.3"
version: "version:0.2.7.chromium.4"
not_match_tag <
abi: "cp27mu"
platform: "manylinux1_i686"
Expand Down
15 changes: 15 additions & 0 deletions .vpython3
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,21 @@
# https://chromium.googlesource.com/infra/infra/+/main/doc/users/vpython.md

python_version: "3.8"

# The default set of platforms vpython checks does not yet include mac-arm64.
# Setting `verify_pep425_tag` to the list of platforms we explicitly must support
# allows us to ensure that vpython specs stay mac-arm64-friendly
verify_pep425_tag: [
{python: "cp38", abi: "cp38", platform: "manylinux1_x86_64"},
{python: "cp38", abi: "cp38", platform: "linux_arm64"},

{python: "cp38", abi: "cp38", platform: "macosx_10_10_intel"},
{python: "cp38", abi: "cp38", platform: "macosx_11_0_arm64"},

{python: "cp38", abi: "cp38", platform: "win32"},
{python: "cp38", abi: "cp38", platform: "win_amd64"}
]

# Used by:
# build/android/pylib/local/emulator/avd.py
# components/policy/test_support/policy_testserver.py
Expand Down

0 comments on commit f82bfc2

Please sign in to comment.