From ddb85e3199741a8ff18f6b254cab56d3f3a80933 Mon Sep 17 00:00:00 2001 From: Ted Pudlik Date: Tue, 14 Nov 2023 17:08:42 +0000 Subject: Revert "bazel: Use Python 3.11" This reverts commit 8a42e20a49f2810d8823cd057c81b6b65c970702. Reason for revert: Broke Mac x86 builders Original change's description: > bazel: Use Python 3.11 > > This matches what we do in GN already. > > Also, change the WORKSPACE name from "python3_10" to just "python3" > (rather than "python3_11"), so that these upgrades don't require us to > change names all over the place (including in downstream!). > > Fixes: b/310293060 > Change-Id: I3479f52a2d8a46850af8a65e14472bc4b6ee1b0d > Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/180534 > Reviewed-by: Armando Montanez > Commit-Queue: Ted Pudlik TBR=amontanez@google.com,pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com,tonymd@google.com,tpudlik@google.com Change-Id: Icc0497f62278dae5af0a0ad6b2abce3a946e51de No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/180914 Reviewed-by: Rob Mohr Commit-Queue: Ted Pudlik Reviewed-by: Ted Pudlik --- BUILD.bazel | 2 +- WORKSPACE | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index fa64b0ae3..38273ae0d 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -load("@python3//:defs.bzl", "interpreter") +load("@python3_10//:defs.bzl", "interpreter") licenses(["notice"]) diff --git a/WORKSPACE b/WORKSPACE index 085b2bf4a..06f1c89d2 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -139,15 +139,15 @@ http_archive( load("@rules_python//python:repositories.bzl", "python_register_toolchains") -# Use Python 3.11 for bazel Python rules. +# Use Python 3.10 for bazel Python rules. python_register_toolchains( - name = "python3", + name = "python3_10", # Allows building as root in a docker container. Required by oss-fuzz. ignore_root_user_error = True, - python_version = "3.11", + python_version = "3.10", ) -load("@python3//:defs.bzl", "interpreter") +load("@python3_10//:defs.bzl", "interpreter") load("@rules_python//python:pip.bzl", "pip_parse") # Specify third party Python package versions with pip_parse. -- cgit v1.2.3