From 312cd0453c2aecb5289fc86dcba7f33330de69ec Mon Sep 17 00:00:00 2001 From: Josip Sokcevic Date: Fri, 12 Jan 2024 00:11:40 +0000 Subject: [PATCH] Reland^3 "Upgrade python to 3.11" This is a reland of commit 6a9dd48b279ea6607fe855728fcafe39f2884ee1 Bug: 1500415 Change-Id: I9de26bf55de10da15d7c809cc9223b36b7ae31f1 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5189582 Reviewed-by: Brian Ryner Commit-Queue: Josip Sokcevic --- .vpython3 | 14 +++++++------- bootstrap/manifest.txt | 2 +- tests/gclient_eval_unittest.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.vpython3 b/.vpython3 index 3426ec4bff..ee587c6ea0 100644 --- a/.vpython3 +++ b/.vpython3 @@ -1,17 +1,17 @@ -python_version: "3.8" +python_version: "3.11" # The default set of platforms vpython checks for 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: "cp311", abi: "cp311", platform: "manylinux1_x86_64"}, + {python: "cp311", abi: "cp311", platform: "linux_arm64"}, - {python: "cp38", abi: "cp38", platform: "macosx_10_10_intel"}, - {python: "cp38", abi: "cp38", platform: "macosx_11_0_arm64"}, + {python: "cp311", abi: "cp311", platform: "macosx_10_10_intel"}, + {python: "cp311", abi: "cp311", platform: "macosx_11_0_arm64"}, - {python: "cp38", abi: "cp38", platform: "win32"}, - {python: "cp38", abi: "cp38", platform: "win_amd64"} + {python: "cp311", abi: "cp311", platform: "win32"}, + {python: "cp311", abi: "cp311", platform: "win_amd64"} ] # Used by: diff --git a/bootstrap/manifest.txt b/bootstrap/manifest.txt index de5f0f20f1..6ba507808d 100644 --- a/bootstrap/manifest.txt +++ b/bootstrap/manifest.txt @@ -18,7 +18,7 @@ $VerifiedPlatform windows-amd64 windows-arm64 linux-amd64 mac-amd64 mac-arm64 @Subdir python3 -infra/3pp/tools/cpython3/${platform} version:2@3.8.10.chromium.26 +infra/3pp/tools/cpython3/${platform} version:2@3.11.6.chromium.30 @Subdir git infra/3pp/tools/git/${platform} version:2@2.41.0.chromium.11 diff --git a/tests/gclient_eval_unittest.py b/tests/gclient_eval_unittest.py index 8df345b770..647ec1a43d 100755 --- a/tests/gclient_eval_unittest.py +++ b/tests/gclient_eval_unittest.py @@ -93,7 +93,7 @@ class GClientEvalTest(unittest.TestCase): def test_not_whitelisted(self): with self.assertRaises(ValueError) as cm: gclient_eval._gclient_eval('[x for x in [1, 2, 3]]') - self.assertIn('unexpected AST node: <_ast.ListComp object', + self.assertIn('unexpected AST node: