Skip to content

Commit dd3b88e

Browse files
committed
bazel/macos: Bump version -> 7 and update rules_python
Signed-off-by: Ryan Northey <ryan@synca.io>
1 parent 9be9637 commit dd3b88e

File tree

6 files changed

+40
-11
lines changed

6 files changed

+40
-11
lines changed

.bazelrc

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
common --noenable_bzlmod
2+
13
# Pass CC, CXX and PATH from the environment.
24
build --action_env=CC
35
build --action_env=CXX

.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.2.0
1+
7.1.0

WORKSPACE

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ load("@proxy_wasm_cpp_host//bazel:repositories.bzl", "proxy_wasm_cpp_host_reposi
44

55
proxy_wasm_cpp_host_repositories()
66

7+
load("@proxy_wasm_cpp_host//bazel:python.bzl", "proxy_wasm_cpp_host_python")
8+
9+
proxy_wasm_cpp_host_python()
10+
711
load("@proxy_wasm_cpp_host//bazel:dependencies.bzl", "proxy_wasm_cpp_host_dependencies")
812

913
proxy_wasm_cpp_host_dependencies()

bazel/dependencies.bzl

+5-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ load("@bazel-zig-cc//toolchain:defs.bzl", zig_register_toolchains = "register_to
1616
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
1717
load("@proxy_wasm_cpp_host//bazel/cargo/wasmsign:crates.bzl", "wasmsign_fetch_remote_crates")
1818
load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime:crates.bzl", "wasmtime_fetch_remote_crates")
19+
load("@python_3_11//:defs.bzl", "interpreter")
1920
load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
2021
load("@rules_fuzzing//fuzzing:init.bzl", "rules_fuzzing_init")
2122
load("@rules_fuzzing//fuzzing:repositories.bzl", "rules_fuzzing_dependencies")
22-
load("@rules_python//python:pip.bzl", "pip_install")
23+
load("@rules_python//python:pip.bzl", "pip_parse")
2324
load("@rules_rust//rust:repositories.bzl", "rust_repositories", "rust_repository_set")
2425

2526
def proxy_wasm_cpp_host_dependencies():
@@ -71,11 +72,11 @@ def proxy_wasm_cpp_host_dependencies():
7172
protobuf_deps()
7273

7374
# V8 dependencies.
74-
75-
pip_install(
75+
pip_parse(
7676
name = "v8_python_deps",
77+
python_interpreter_target = interpreter,
7778
extra_pip_args = ["--require-hashes"],
78-
requirements = "@v8//:bazel/requirements.txt",
79+
requirements_lock = "@v8//:bazel/requirements.txt",
7980
)
8081

8182
# Wasmtime dependencies.

bazel/python.bzl

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Copyright 2020 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
16+
17+
def proxy_wasm_cpp_host_python():
18+
py_repositories()
19+
python_register_toolchains(
20+
name = "python_3_11",
21+
python_version = "3.11",
22+
)

bazel/repositories.bzl

+6-6
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@ def proxy_wasm_cpp_host_repositories():
5858
maybe(
5959
http_archive,
6060
name = "rules_fuzzing",
61-
sha256 = "23bb074064c6f488d12044934ab1b0631e8e6898d5cf2f6bde087adb01111573",
62-
strip_prefix = "rules_fuzzing-0.3.1",
63-
url = "https://github.com/bazelbuild/rules_fuzzing/archive/v0.3.1.zip",
61+
sha256 = "6a3bd3c701d8d5fa0f28db229d2d1a3fc6f274c006e10ceb89d8dcb529e1959d",
62+
strip_prefix = "rules_fuzzing-1dbcd9167300ad226d29972f5f9c925d6d81f441",
63+
url = "https://github.com/bazelbuild/rules_fuzzing/archive/1dbcd9167300ad226d29972f5f9c925d6d81f441.zip",
6464
)
6565

6666
maybe(
6767
http_archive,
6868
name = "rules_python",
69-
sha256 = "a30abdfc7126d497a7698c29c46ea9901c6392d6ed315171a6df5ce433aa4502",
70-
strip_prefix = "rules_python-0.6.0",
71-
url = "https://github.com/bazelbuild/rules_python/archive/0.6.0.tar.gz",
69+
sha256 = "c68bdc4fbec25de5b5493b8819cfc877c4ea299c0dcb15c244c5a00208cde311",
70+
strip_prefix = "rules_python-0.31.0",
71+
url = "https://github.com/bazelbuild/rules_python/archive/0.31.0.tar.gz",
7272
)
7373

7474
maybe(

0 commit comments

Comments
 (0)