| From ba6e8aa8430277380aaf67a5c25d07911c5c322f Mon Sep 17 00:00:00 2001 |
| From: Protobuf Team Bot <protobuf-github-bot@google.com> |
| Date: Wed, 5 Jun 2024 13:36:57 -0700 |
| Subject: [PATCH 1/2] Update rules_python to 0.28.0 |
| |
| Closes #15849 |
| |
| PiperOrigin-RevId: 640633756 |
| --- |
| MODULE.bazel | 2 +- |
| python/dist/system_python.bzl | 12 ++++-------- |
| 4 files changed, 10 insertions(+), 14 deletions(-) |
| |
| diff --git a/MODULE.bazel b/MODULE.bazel |
| index 842953b43..71d29efcb 100644 |
| --- a/MODULE.bazel |
| +++ b/MODULE.bazel |
| @@ -18,7 +18,7 @@ bazel_dep(name = "rules_cc", version = "0.0.9") |
| bazel_dep(name = "rules_java", version = "5.3.5") |
| bazel_dep(name = "rules_jvm_external", version = "5.1") |
| bazel_dep(name = "rules_pkg", version = "0.7.0") |
| -bazel_dep(name = "rules_python", version = "0.10.2") |
| +bazel_dep(name = "rules_python", version = "0.28.0") |
| bazel_dep(name = "platforms", version = "0.0.8") |
| bazel_dep(name = "zlib", version = "1.2.11") |
| |
| diff --git a/python/dist/system_python.bzl b/python/dist/system_python.bzl |
| index 29400be22..db5b30e0b 100644 |
| --- a/python/dist/system_python.bzl |
| +++ b/python/dist/system_python.bzl |
| @@ -36,7 +36,7 @@ pip_parse = pip_install |
| |
| # Alias rules_python's pip.bzl for cases where a system python is found. |
| _alias_pip = """ |
| -load("@rules_python//python:pip.bzl", _pip_install = "pip_install", _pip_parse = "pip_parse") |
| +load("@rules_python//python:pip.bzl", _pip_parse = "pip_parse") |
| |
| def _get_requirements(requirements, requirements_overrides): |
| for version, override in requirements_overrides.items(): |
| @@ -45,18 +45,14 @@ def _get_requirements(requirements, requirements_overrides): |
| break |
| return requirements |
| |
| -def pip_install(requirements, requirements_overrides={{}}, **kwargs): |
| - _pip_install( |
| - python_interpreter_target = "@{repo}//:interpreter", |
| - requirements = _get_requirements(requirements, requirements_overrides), |
| - **kwargs, |
| - ) |
| def pip_parse(requirements, requirements_overrides={{}}, **kwargs): |
| _pip_parse( |
| python_interpreter_target = "@{repo}//:interpreter", |
| - requirements = _get_requirements(requirements, requirements_overrides), |
| + requirements_lock = _get_requirements(requirements, requirements_overrides), |
| **kwargs, |
| ) |
| + |
| +pip_install = pip_parse |
| """ |
| |
| _mock_fuzzing_py = """ |
| -- |
| 2.45.2.505.gda0bf45e8d-goog |
| |
