From 8fc5dbb55997a01e5c6ce81a631267bc788af47d Mon Sep 17 00:00:00 2001
From: James Sharpe <james.sharpe@zenotech.com>
Date: Sat, 14 Oct 2023 16:10:57 +0100
Subject: [PATCH] Upgrade rules_python (#1058)

---
 .bazelci/config.yaml           | 11 +----------
 examples/requirements_lock.txt |  4 ++--
 foreign_cc/repositories.bzl    |  6 +++---
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/.bazelci/config.yaml b/.bazelci/config.yaml
index 0a421afd..e689c45c 100644
--- a/.bazelci/config.yaml
+++ b/.bazelci/config.yaml
@@ -216,22 +216,13 @@ tasks:
       - "--experimental_enable_aggregating_middleman=False"
   min_supported_version_examples:
     name: "Minimum Supported Version Examples"
-    bazel: "4.2.0"
-    skip_in_bazel_downstream_pipeline: "Bazel 4 required"
+    bazel: "5.4.0"
     platform: ubuntu1804
     working_directory: examples
     min_supported_targets: &min_supported_targets
       - "//..."
-      # Requires Python 2 under Bazel 4; skip so that Bazel 7 can disable Python 2
-      # See https://github.com/bazelbuild/bazel/issues/17293
-      - "-//cmake_android:app"
     build_targets: *min_supported_targets
-    # See comment above regarding --experimental_enable_aggregating_middleman=False
-    build_flags:
-      - "--experimental_enable_aggregating_middleman=False"
     test_targets: *min_supported_targets
-    test_flags:
-      - "--experimental_enable_aggregating_middleman=False"
 
 buildifier:
   version: "6.1.0"
diff --git a/examples/requirements_lock.txt b/examples/requirements_lock.txt
index 3a2f41b7..dc3976bc 100644
--- a/examples/requirements_lock.txt
+++ b/examples/requirements_lock.txt
@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
 #
 #    bazel run //:requirements.update
 #
diff --git a/foreign_cc/repositories.bzl b/foreign_cc/repositories.bzl
index 4c493191..5e55a72a 100644
--- a/foreign_cc/repositories.bzl
+++ b/foreign_cc/repositories.bzl
@@ -96,7 +96,7 @@ def rules_foreign_cc_dependencies(
     maybe(
         http_archive,
         name = "rules_python",
-        sha256 = "a3a6e99f497be089f81ec082882e40246bfd435f52f4e82f37e89449b04573f6",
-        strip_prefix = "rules_python-0.10.2",
-        url = "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.10.2.tar.gz",
+        sha256 = "84aec9e21cc56fbc7f1335035a71c850d1b9b5cc6ff497306f84cced9a769841",
+        strip_prefix = "rules_python-0.23.1",
+        url = "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.23.1.tar.gz",
     )