From 4a9739da420b9584d5b9582c19cf3f86a6a90609 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 12 May 2023 08:12:04 +0100 Subject: [PATCH 1/3] nixpkgs: use system Python --- bazel/python_dependencies.bzl | 11 ++++------- bazel/repositories_extra.bzl | 16 ---------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl index ea50bf30ba..b82f374720 100644 --- a/bazel/python_dependencies.bzl +++ b/bazel/python_dependencies.bzl @@ -1,27 +1,24 @@ load("@rules_python//python:pip.bzl", "pip_parse") -load("@python3_11//:defs.bzl", "interpreter") -load("@envoy_toolshed//:packages.bzl", "load_packages") def envoy_python_dependencies(): - # TODO(phlax): rename base_pip3 -> pip3 and remove this - load_packages() + pip_parse( + name = "pip3", + requirements_lock = "@envoy_toolshed//:requirements.txt", + ) pip_parse( name = "base_pip3", - python_interpreter_target = interpreter, requirements_lock = "@envoy//tools/base:requirements.txt", extra_pip_args = ["--require-hashes"], ) pip_parse( name = "dev_pip3", - python_interpreter_target = interpreter, requirements_lock = "@envoy//tools/dev:requirements.txt", extra_pip_args = ["--require-hashes"], ) pip_parse( name = "fuzzing_pip3", - python_interpreter_target = interpreter, requirements_lock = "@rules_fuzzing//fuzzing:requirements.txt", extra_pip_args = ["--require-hashes"], ) diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl index 40d348073f..17b98b1ea1 100644 --- a/bazel/repositories_extra.bzl +++ b/bazel/repositories_extra.bzl @@ -1,29 +1,13 @@ load("@emsdk//:deps.bzl", emsdk_deps = "deps") -load("@rules_python//python:repositories.bzl", "python_register_toolchains") load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime:crates.bzl", "wasmtime_fetch_remote_crates") load("//bazel/external/cargo:crates.bzl", "raze_fetch_remote_crates") load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies") -def _python_minor_version(python_version): - return "_".join(python_version.split(".")[:-1]) - -# Python version for `rules_python` -PYTHON_VERSION = "3.11.3" -PYTHON_MINOR_VERSION = _python_minor_version(PYTHON_VERSION) - # Envoy deps that rely on a first stage of dependency loading in envoy_dependencies(). def envoy_dependencies_extra( - python_version = PYTHON_VERSION, ignore_root_user_error = False): emsdk_deps() raze_fetch_remote_crates() wasmtime_fetch_remote_crates() - # Registers underscored Python minor version - eg `python3_10` - python_register_toolchains( - name = "python%s" % _python_minor_version(python_version), - python_version = python_version, - ignore_root_user_error = ignore_root_user_error, - ) - aspect_bazel_lib_dependencies() -- 2.42.0