Skip to content

Commit 34168a5

Browse files
belitskiytensorflower-gardener
belitskiy
authored and
tensorflower-gardener
committed
Patch rules_python to point to the newest Python 3.12 patch version.
This should hopefully resolve Windows RBE test runs on Python3.12 flaking with WMI query errors (python/cpython#125315). PiperOrigin-RevId: 725214831
1 parent fb5f04d commit 34168a5

3 files changed

Lines changed: 105 additions & 3 deletions

File tree

‎third_party/py/rules_python.patch‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,38 @@ index c805fd7a..e57e6138 100644
3636
+ Label("@pypi__packaging//:packaging-24.2.dist-info/RECORD"),
3737
Label("//python/private/pypi/requirements_parser:resolve_target_platforms.py"),
3838
Label("//python/private/pypi/whl_installer:platform.py"),
39-
]
39+
]
40+
diff --git a/python/versions.bzl b/python/versions.bzl
41+
index 774c24d1..91e59f9b 100644
42+
--- a/python/versions.bzl
43+
+++ b/python/versions.bzl
44+
@@ -561,6 +561,20 @@ TOOL_VERSIONS = {
45+
},
46+
"strip_prefix": "python",
47+
},
48+
+ "3.12.8": {
49+
+ "url": "20241206/cpython-{python_version}+20241206-{platform}-{build}.tar.gz",
50+
+ "sha256": {
51+
+ "aarch64-apple-darwin": "e3c4aa607717b23903ca2650d5c3ee24f89b97543e2db2b0f463bddc7a9e92f3",
52+
+ "aarch64-unknown-linux-gnu": "ce674b55442b732973afb2932c281bb1ded4ad7e22bcf9b07071165770758c7e",
53+
+ "ppc64le-unknown-linux-gnu": "b7214790b273de9ed0532420054b72ba1393d62d2fc844ec55ade193771bd90c",
54+
+ "s390x-unknown-linux-gnu": "73102f5dbd7d1e7e9c2f2c80aedf2893d99a7fa407f6674ec8b2f57ba07daee5",
55+
+ "x86_64-apple-darwin": "3ba35c706577d755e8e52a4c161a042464577c0e695e2a605362fa469e26de10",
56+
+ "x86_64-pc-windows-msvc": "767b4be3ddf6b99e5ade519789c1615c191d8cf99d5aff4685cc18b48931f1e6",
57+
+ "x86_64-unknown-linux-gnu": "b9d6ee5ddac1198e72d53112698773fc8bb597de095592eb849ca794306699ba",
58+
+ "x86_64-unknown-linux-musl": "6f305888703691dd04cfff85284d23ea0b0146ed7c4415e472f1fb72b3f32cdf",
59+
+ },
60+
+ "strip_prefix": "python",
61+
+ },
62+
"3.13.0": {
63+
"url": "20241016/cpython-{python_version}+20241016-{platform}-{build}.{ext}",
64+
"sha256": {
65+
@@ -589,7 +603,7 @@ MINOR_MAPPING = {
66+
"3.9": "3.9.20",
67+
"3.10": "3.10.15",
68+
"3.11": "3.11.10",
69+
- "3.12": "3.12.7",
70+
+ "3.12": "3.12.8",
71+
"3.13": "3.13.0",
72+
}
73+

‎third_party/xla/third_party/py/rules_python.patch‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,38 @@ index c805fd7a..e57e6138 100644
3636
+ Label("@pypi__packaging//:packaging-24.2.dist-info/RECORD"),
3737
Label("//python/private/pypi/requirements_parser:resolve_target_platforms.py"),
3838
Label("//python/private/pypi/whl_installer:platform.py"),
39-
]
39+
]
40+
diff --git a/python/versions.bzl b/python/versions.bzl
41+
index 774c24d1..91e59f9b 100644
42+
--- a/python/versions.bzl
43+
+++ b/python/versions.bzl
44+
@@ -561,6 +561,20 @@ TOOL_VERSIONS = {
45+
},
46+
"strip_prefix": "python",
47+
},
48+
+ "3.12.8": {
49+
+ "url": "20241206/cpython-{python_version}+20241206-{platform}-{build}.tar.gz",
50+
+ "sha256": {
51+
+ "aarch64-apple-darwin": "e3c4aa607717b23903ca2650d5c3ee24f89b97543e2db2b0f463bddc7a9e92f3",
52+
+ "aarch64-unknown-linux-gnu": "ce674b55442b732973afb2932c281bb1ded4ad7e22bcf9b07071165770758c7e",
53+
+ "ppc64le-unknown-linux-gnu": "b7214790b273de9ed0532420054b72ba1393d62d2fc844ec55ade193771bd90c",
54+
+ "s390x-unknown-linux-gnu": "73102f5dbd7d1e7e9c2f2c80aedf2893d99a7fa407f6674ec8b2f57ba07daee5",
55+
+ "x86_64-apple-darwin": "3ba35c706577d755e8e52a4c161a042464577c0e695e2a605362fa469e26de10",
56+
+ "x86_64-pc-windows-msvc": "767b4be3ddf6b99e5ade519789c1615c191d8cf99d5aff4685cc18b48931f1e6",
57+
+ "x86_64-unknown-linux-gnu": "b9d6ee5ddac1198e72d53112698773fc8bb597de095592eb849ca794306699ba",
58+
+ "x86_64-unknown-linux-musl": "6f305888703691dd04cfff85284d23ea0b0146ed7c4415e472f1fb72b3f32cdf",
59+
+ },
60+
+ "strip_prefix": "python",
61+
+ },
62+
"3.13.0": {
63+
"url": "20241016/cpython-{python_version}+20241016-{platform}-{build}.{ext}",
64+
"sha256": {
65+
@@ -589,7 +603,7 @@ MINOR_MAPPING = {
66+
"3.9": "3.9.20",
67+
"3.10": "3.10.15",
68+
"3.11": "3.11.10",
69+
- "3.12": "3.12.7",
70+
+ "3.12": "3.12.8",
71+
"3.13": "3.13.0",
72+
}
73+

‎third_party/xla/third_party/tsl/third_party/py/rules_python.patch‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,38 @@ index c805fd7a..e57e6138 100644
3636
+ Label("@pypi__packaging//:packaging-24.2.dist-info/RECORD"),
3737
Label("//python/private/pypi/requirements_parser:resolve_target_platforms.py"),
3838
Label("//python/private/pypi/whl_installer:platform.py"),
39-
]
39+
]
40+
diff --git a/python/versions.bzl b/python/versions.bzl
41+
index 774c24d1..91e59f9b 100644
42+
--- a/python/versions.bzl
43+
+++ b/python/versions.bzl
44+
@@ -561,6 +561,20 @@ TOOL_VERSIONS = {
45+
},
46+
"strip_prefix": "python",
47+
},
48+
+ "3.12.8": {
49+
+ "url": "20241206/cpython-{python_version}+20241206-{platform}-{build}.tar.gz",
50+
+ "sha256": {
51+
+ "aarch64-apple-darwin": "e3c4aa607717b23903ca2650d5c3ee24f89b97543e2db2b0f463bddc7a9e92f3",
52+
+ "aarch64-unknown-linux-gnu": "ce674b55442b732973afb2932c281bb1ded4ad7e22bcf9b07071165770758c7e",
53+
+ "ppc64le-unknown-linux-gnu": "b7214790b273de9ed0532420054b72ba1393d62d2fc844ec55ade193771bd90c",
54+
+ "s390x-unknown-linux-gnu": "73102f5dbd7d1e7e9c2f2c80aedf2893d99a7fa407f6674ec8b2f57ba07daee5",
55+
+ "x86_64-apple-darwin": "3ba35c706577d755e8e52a4c161a042464577c0e695e2a605362fa469e26de10",
56+
+ "x86_64-pc-windows-msvc": "767b4be3ddf6b99e5ade519789c1615c191d8cf99d5aff4685cc18b48931f1e6",
57+
+ "x86_64-unknown-linux-gnu": "b9d6ee5ddac1198e72d53112698773fc8bb597de095592eb849ca794306699ba",
58+
+ "x86_64-unknown-linux-musl": "6f305888703691dd04cfff85284d23ea0b0146ed7c4415e472f1fb72b3f32cdf",
59+
+ },
60+
+ "strip_prefix": "python",
61+
+ },
62+
"3.13.0": {
63+
"url": "20241016/cpython-{python_version}+20241016-{platform}-{build}.{ext}",
64+
"sha256": {
65+
@@ -589,7 +603,7 @@ MINOR_MAPPING = {
66+
"3.9": "3.9.20",
67+
"3.10": "3.10.15",
68+
"3.11": "3.11.10",
69+
- "3.12": "3.12.7",
70+
+ "3.12": "3.12.8",
71+
"3.13": "3.13.0",
72+
}
73+

0 commit comments

Comments
 (0)