Revert "Reland Migrate to python 3.11 from 3.8"
This reverts commit ae42a262c8c615956b14ae6de6181a7e09239ad7.
Reason for revert: Likely cause random test suite hanging on Android,
i.e. https://crbug.com/40942322#comment85
Original change's description:
> Reland Migrate to python 3.11 from 3.8
>
> Original CL: https://chromium-review.googlesource.com/c/chromium/src/+/5872818
> was reverted and was not able to create an actual reland because of
> rebase merge failure with "create reland" button.
>
> Previous CL was reverted from failing:
> chromeos-jacuzzi-rel
> chromeos-octopus-rel
>
> This is from a incompatibility in aioquic, which is now fixed with
> an update to aioquick 1.2 (and its supporting libraries) as well as
> adding python and permission changes to chromeos.
>
> crrev.com/5904256
> crrev.com/5904734
>
> and some internal changes.
>
> The webtransport_h3_server.py file has to be changed here with the
> vpython change, and then wpt can be rolled. The change is already
> in the wpt repo, but has been manually excluded in the roll.
>
> Bug: 40942322
> Change-Id: Id12b7085fbc1ffd7694712013e6f746e65c3499f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5887447
> Reviewed-by: Ben Pastene <[email protected]>
> Reviewed-by: Brian Sheedy <[email protected]>
> Commit-Queue: Benjamin Joyce (Ben) <[email protected]>
> Reviewed-by: Jonathan Lee <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#1370866}
Bug: 40942322
Change-Id: Ic83a8973075d153004c63b3000a522e7e34e108c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5949932
Reviewed-by: Brian Sheedy <[email protected]>
Commit-Queue: Haiyang Pan <[email protected]>
Reviewed-by: Benjamin Joyce (Ben) <[email protected]>
Reviewed-by: Jonathan Lee <[email protected]>
Bot-Commit: Rubber Stamper <[email protected]>
Reviewed-by: Ben Pastene <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1371757}
diff --git a/.vpython3 b/.vpython3
index 2cb7fe6c..3a5b613f 100644
--- a/.vpython3
+++ b/.vpython3
@@ -22,20 +22,20 @@
# Read more about `vpython` and how to modify this file here:
# https://chromium.googlesource.com/infra/infra/+/main/doc/users/vpython.md
-python_version: "3.11"
+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: "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:
@@ -111,7 +111,7 @@
>
wheel: <
name: "infra/python/wheels/ninja/${vpython_platform}"
- version: "version:1.10.2.4.chromium.1"
+ version: "version:1.10.0.post2"
match_tag: <
platform: "manylinux1_x86_64"
>
@@ -150,7 +150,7 @@
>
wheel: <
name: "infra/python/wheels/opencv_python/${vpython_platform}"
- version: "version:4.8.1.78.chromium.1"
+ version: "version:4.5.3.56.chromium.4"
# There is currently no Linux arm/arm64 version in CIPD.
not_match_tag: <
platform: "linux_arm64"
@@ -177,8 +177,8 @@
>
wheel: <
- name: "infra/python/wheels/pyfakefs-py3"
- version: "version:5.5.0"
+ name: "infra/python/wheels/pyfakefs-py2_py3"
+ version: "version:3.7.2"
>
# Used by:
@@ -189,7 +189,7 @@
>
wheel: <
name: "infra/python/wheels/python-dateutil-py2_py3"
- version: "version:2.8.1"
+ version: "version:2.7.3"
>
# Used by WPT importer
@@ -210,8 +210,8 @@
version: "version:3.4.2"
>
wheel: <
- name: "infra/python/wheels/cachetools-py3"
- version: "version:5.3.3"
+ name: "infra/python/wheels/cachetools-py2_py3"
+ version: "version:2.0.1"
>
wheel: <
name: "infra/python/wheels/uritemplate-py3"
@@ -255,7 +255,7 @@
# //third_party/chromite/bin/cros chrome-sdk
wheel: <
name: "infra/python/wheels/crcmod/${vpython_platform}"
- version: "version:1.7.chromium.4"
+ version: "version:1.7.chromium.3"
>
wheel: <
@@ -322,7 +322,7 @@
>
wheel: <
name: "infra/python/wheels/mozprocess-py3"
- version: "version:1.3.1"
+ version: "version:1.3.0"
>
wheel: <
name: "infra/python/wheels/urllib3-py2_py3"
@@ -362,7 +362,7 @@
>
wheel: <
name: "infra/python/wheels/aioquic/${vpython_platform}"
- version: "version:1.2.0.chromium.1"
+ version: "version:0.9.20.chromium.1"
>
wheel: <
name: "infra/python/wheels/pylsqpack/${vpython_platform}"
@@ -370,11 +370,11 @@
>
wheel: <
name: "infra/python/wheels/cryptography/${vpython_platform}"
- version: "version:43.0.0"
+ version: "version:3.3.1.chromium.1"
>
wheel: <
name: "infra/python/wheels/cffi/${vpython_platform}"
- version: "version:1.15.1.chromium.2"
+ version: "version:1.14.5.chromium.7"
>
wheel: <
name: "infra/python/wheels/pycparser-py2_py3"
@@ -433,9 +433,9 @@
version: "version:0.19.0"
>
-wheel: <
- name: "infra/python/wheels/attrs-py3"
- version: "version:23.1.0"
+wheel <
+ name: "infra/python/wheels/attrs-py2_py3"
+ version: "version:21.4.0"
>
wheel <
@@ -450,7 +450,7 @@
wheel <
name: "infra/python/wheels/py-py2_py3"
- version: "version:1.11.0"
+ version: "version:1.10.0"
>
wheel <
@@ -472,7 +472,7 @@
# //testing/buildbot/generate_buildbot_json_coveragetest.py
wheel: <
name: "infra/python/wheels/coverage/${vpython_platform}"
- version: "version:7.3.1"
+ version: "version:5.5.chromium.3"
>
wheel: <
@@ -494,14 +494,14 @@
# //tools/perf/crossbench
wheel: <
name: "infra/python/wheels/pytz-py2_py3"
- version: "version:2024.1"
+ version: "version:2018.4"
>
# Used by:
# //third_party/blink/tools/blinkpy/web_tests/port/server_process.py
wheel: <
name: "infra/python/wheels/pywin32/${vpython_platform}"
- version: "version:306"
+ version: "version:300"
match_tag: <
platform: "win32"
>
@@ -514,7 +514,7 @@
# //content/test/gpu/gpu_tests/color_profile_manager_mac.py
wheel: <
name: "infra/python/wheels/pyobjc/${vpython_platform}"
- version: "version:10.0"
+ version: "version:7.3.chromium.1"
match_tag: <
platform: "macosx_10_10_intel"
>
@@ -535,7 +535,7 @@
# //tools/perf/crossbench
wheel: <
name: "infra/python/wheels/pandas/${vpython_platform}"
- version: "version:1.5.3.chromium.1"
+ version: "version:1.3.2.chromium.1"
not_match_tag: <
platform: "linux_arm64"
>
@@ -574,10 +574,6 @@
version: "version:4.1.0"
>
wheel: <
- name: "infra/python/wheels/service-identity-py3"
- version: "version:24.1.0"
->
-wheel: <
name: "infra/python/wheels/trio-py3"
version: "version:0.20.0"
>
@@ -610,8 +606,8 @@
version: "version:2.4.0"
>
wheel: <
- name: "infra/python/wheels/pyopenssl-py3"
- version: "version:24.2.1"
+ name: "infra/python/wheels/pyopenssl-py2_py3"
+ version: "version:20.0.0"
>
# Used by //tools/md_browser to render Markdown.
@@ -688,12 +684,6 @@
# Needed by pytype
wheel: <
- name: "infra/python/wheels/pysocks-py3"
- version: "version:1.7.1"
->
-
-# Needed by pytype
-wheel: <
name: "infra/python/wheels/pycnite-py3"
version: "version:2023.10.11"
>
@@ -710,7 +700,3 @@
version: "version:2.0.1"
>
-wheel: <
- name: "infra/python/wheels/apipkg-py2_py3"
- version: "version:1.5"
->
