From d6aaf4522ada2fa794510f4978199d31b07f905f Mon Sep 17 00:00:00 2001 From: Ben Pastene Date: Wed, 13 Dec 2023 19:31:19 +0000 Subject: [PATCH] Revert "Reland "Upgrade python to 3.11"" This reverts commit 32c1207c9efd529fb69d859bdf2a29cd484fb84c. Reason for revert: spec reverting for `FileNotFoundError: shell not found` errors on win-presubmit https://ci.chromium.org/ui/p/chromium/builders/try/win-presubmit?limit=200 eg https://ci.chromium.org/ui/p/chromium/builders/try/win-presubmit/377708/overview Original change's description: > Reland "Upgrade python to 3.11" > > This is a reland of commit 6a167d1e1fb23a141d4860b5f02693deb21936db > > Original change's description: > > Upgrade python to 3.11 > > > > R=bryner > > > > Bug: 1500415 > > Change-Id: Ie379744131f7a9ced204a31f21079cb697c889a6 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5030767 > > Reviewed-by: Brian Ryner > > Commit-Queue: Josip Sokcevic > > Bug: 1500415 > Change-Id: I0cce81772186a26c3bdb67c5b49ce383b8a1443e > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5118884 > Commit-Queue: Peter Wen > Reviewed-by: Brian Ryner Bug: 1500415 Change-Id: Ic57bdd4919f44b38b7edc334dc7e504e19256067 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5119766 Commit-Queue: Josip Sokcevic Reviewed-by: Josip Sokcevic Bot-Commit: Rubber Stamper Auto-Submit: Ben Pastene Reviewed-by: Brian Ryner --- .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 ee587c6ea..3426ec4bf 100644 --- a/.vpython3 +++ b/.vpython3 @@ -1,17 +1,17 @@ -python_version: "3.11" +python_version: "3.8" # 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: "cp311", abi: "cp311", platform: "manylinux1_x86_64"}, - {python: "cp311", abi: "cp311", platform: "linux_arm64"}, + {python: "cp38", abi: "cp38", platform: "manylinux1_x86_64"}, + {python: "cp38", abi: "cp38", platform: "linux_arm64"}, - {python: "cp311", abi: "cp311", platform: "macosx_10_10_intel"}, - {python: "cp311", abi: "cp311", platform: "macosx_11_0_arm64"}, + {python: "cp38", abi: "cp38", platform: "macosx_10_10_intel"}, + {python: "cp38", abi: "cp38", platform: "macosx_11_0_arm64"}, - {python: "cp311", abi: "cp311", platform: "win32"}, - {python: "cp311", abi: "cp311", platform: "win_amd64"} + {python: "cp38", abi: "cp38", platform: "win32"}, + {python: "cp38", abi: "cp38", platform: "win_amd64"} ] # Used by: diff --git a/bootstrap/manifest.txt b/bootstrap/manifest.txt index 25a376895..840584303 100644 --- a/bootstrap/manifest.txt +++ b/bootstrap/manifest.txt @@ -21,7 +21,7 @@ $VerifiedPlatform windows-amd64 windows-arm64 linux-amd64 mac-amd64 mac-arm64 infra/3pp/tools/cpython/${platform} version:2@2.7.18.chromium.44 @Subdir python3 -infra/3pp/tools/cpython3/${platform} version:2@3.11.6.chromium.30 +infra/3pp/tools/cpython3/${platform} version:2@3.8.10.chromium.26 @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 647ec1a43..8df345b77 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: