59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
|
diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl
|
||
|
|
index d9dfb14a9b..b8e92452a7 100644
|
||
|
|
--- a/bazel/python_dependencies.bzl
|
||
|
|
+++ b/bazel/python_dependencies.bzl
|
||
|
|
@@ -1,10 +1,8 @@
|
||
|
|
load("@rules_python//python:pip.bzl", "pip_install", "pip_parse")
|
||
|
|
-load("@python3_10//:defs.bzl", "interpreter")
|
||
|
|
|
||
|
|
def envoy_python_dependencies():
|
||
|
|
pip_parse(
|
||
|
|
name = "base_pip3",
|
||
|
|
- python_interpreter_target = interpreter,
|
||
|
|
requirements_lock = "@envoy//tools/base:requirements.txt",
|
||
|
|
extra_pip_args = ["--require-hashes"],
|
||
|
|
)
|
||
|
|
@@ -12,14 +10,12 @@ def envoy_python_dependencies():
|
||
|
|
# These need to use `pip_install`
|
||
|
|
pip_install(
|
||
|
|
# Note: dev requirements do *not* check hashes
|
||
|
|
- python_interpreter_target = interpreter,
|
||
|
|
name = "dev_pip3",
|
||
|
|
requirements = "@envoy//tools/dev:requirements.txt",
|
||
|
|
)
|
||
|
|
|
||
|
|
pip_install(
|
||
|
|
name = "fuzzing_pip3",
|
||
|
|
- python_interpreter_target = interpreter,
|
||
|
|
requirements = "@rules_fuzzing//fuzzing:requirements.txt",
|
||
|
|
extra_pip_args = ["--require-hashes"],
|
||
|
|
)
|
||
|
|
diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl
|
||
|
|
index 885b41dec6..ac5605eb30 100644
|
||
|
|
--- a/bazel/repositories_extra.bzl
|
||
|
|
+++ b/bazel/repositories_extra.bzl
|
||
|
|
@@ -1,22 +1,12 @@
|
||
|
|
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")
|
||
|
|
|
||
|
|
-# Python version for `rules_python`
|
||
|
|
-PYTHON_VERSION = "3.10.2"
|
||
|
|
-
|
||
|
|
# Envoy deps that rely on a first stage of dependency loading in envoy_dependencies().
|
||
|
|
-def envoy_dependencies_extra(python_version = PYTHON_VERSION):
|
||
|
|
+def envoy_dependencies_extra():
|
||
|
|
emsdk_deps()
|
||
|
|
raze_fetch_remote_crates()
|
||
|
|
wasmtime_fetch_remote_crates()
|
||
|
|
|
||
|
|
- # Registers underscored Python minor version - eg `python3_10`
|
||
|
|
- python_register_toolchains(
|
||
|
|
- name = "python%s" % ("_".join(python_version.split(".")[:-1])),
|
||
|
|
- python_version = python_version,
|
||
|
|
- )
|
||
|
|
-
|
||
|
|
aspect_bazel_lib_dependencies()
|