at 23.05-pre 58 lines 2.3 kB view raw
1diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl 2index d9dfb14a9b..b8e92452a7 100644 3--- a/bazel/python_dependencies.bzl 4+++ b/bazel/python_dependencies.bzl 5@@ -1,10 +1,8 @@ 6 load("@rules_python//python:pip.bzl", "pip_install", "pip_parse") 7-load("@python3_10//:defs.bzl", "interpreter") 8 9 def envoy_python_dependencies(): 10 pip_parse( 11 name = "base_pip3", 12- python_interpreter_target = interpreter, 13 requirements_lock = "@envoy//tools/base:requirements.txt", 14 extra_pip_args = ["--require-hashes"], 15 ) 16@@ -12,14 +10,12 @@ def envoy_python_dependencies(): 17 # These need to use `pip_install` 18 pip_install( 19 # Note: dev requirements do *not* check hashes 20- python_interpreter_target = interpreter, 21 name = "dev_pip3", 22 requirements = "@envoy//tools/dev:requirements.txt", 23 ) 24 25 pip_install( 26 name = "fuzzing_pip3", 27- python_interpreter_target = interpreter, 28 requirements = "@rules_fuzzing//fuzzing:requirements.txt", 29 extra_pip_args = ["--require-hashes"], 30 ) 31diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl 32index 885b41dec6..ac5605eb30 100644 33--- a/bazel/repositories_extra.bzl 34+++ b/bazel/repositories_extra.bzl 35@@ -1,22 +1,12 @@ 36 load("@emsdk//:deps.bzl", emsdk_deps = "deps") 37-load("@rules_python//python:repositories.bzl", "python_register_toolchains") 38 load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime:crates.bzl", "wasmtime_fetch_remote_crates") 39 load("//bazel/external/cargo:crates.bzl", "raze_fetch_remote_crates") 40 load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies") 41 42-# Python version for `rules_python` 43-PYTHON_VERSION = "3.10.2" 44- 45 # Envoy deps that rely on a first stage of dependency loading in envoy_dependencies(). 46-def envoy_dependencies_extra(python_version = PYTHON_VERSION): 47+def envoy_dependencies_extra(): 48 emsdk_deps() 49 raze_fetch_remote_crates() 50 wasmtime_fetch_remote_crates() 51 52- # Registers underscored Python minor version - eg `python3_10` 53- python_register_toolchains( 54- name = "python%s" % ("_".join(python_version.split(".")[:-1])), 55- python_version = python_version, 56- ) 57- 58 aspect_bazel_lib_dependencies()