Skip to content

fix: support Bazel 10 (10.0.0rc2) #377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jvolkman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: support Bazel 10 (10.0.0rc2) #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
# Take care to document any settings that you expect users to apply.
# Settings that apply only to CI are in .github/workflows/ci.bazelrc

# Required until this is the default; expected in Bazel 7
common --enable_bzlmod

# Don’t want to push a rules author to update their deps if not needed.
# https://bazel.build/reference/command-line-reference#flag--check_direct_dependencies
# https://bazelbuild.slack.com/archives/C014RARENH0/p1691158021917459?thread_ts=1691156601.420349&cid=C014RARENH0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
strategy:
fail-fast: false
matrix:
bazel: ["8.7.0", "9.1.0"]
bazel: ["8.7.0", "9.1.0", "10.0.0rc2"]
workspace: ${{ fromJSON(needs.unit.outputs.e2e-workspaces) }}
steps:
- uses: actions/checkout@v6
Expand Down
4 changes: 4 additions & 0 deletions modules/backend_maturin/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")

package(default_visibility = ["//visibility:public"])

exports_files([
"defs.bzl",
])

bzl_library(
name = "defs",
srcs = ["defs.bzl"],
Expand Down
5 changes: 5 additions & 0 deletions modules/backend_maturin/extensions/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")

package(default_visibility = ["//visibility:public"])

exports_files([
"maturin.bzl",
"setuptools_rust.bzl",
])

bzl_library(
name = "maturin",
srcs = ["maturin.bzl"],
Expand Down
5 changes: 2 additions & 3 deletions pycross/private/build/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,9 @@ bzl_library(
name = "cc_toolchain_util",
srcs = ["cc_toolchain_util.bzl"],
deps = [
# keep
"@bazel_skylib//lib:collections",
"@bazel_tools//tools/build_defs/cc:action_names.bzl",
"@bazel_tools//tools/cpp:toolchain_utils.bzl",
"@rules_cc//cc:action_names_bzl",
"@rules_cc//cc:find_cc_toolchain_bzl",
"@rules_cc//cc/common",
],
)
Expand Down
3 changes: 2 additions & 1 deletion pycross/private/build/actions/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ bzl_library(
deps = [
"//pycross/private/build:cc_toolchain_util",
"@bazel_skylib//lib:shell",
"@bazel_tools//tools/cpp:toolchain_utils.bzl",
"@rules_cc//cc:find_cc_toolchain_bzl",
"@rules_cc//cc/common",
],
)

Expand Down
2 changes: 1 addition & 1 deletion pycross/private/build/actions/cc_layer.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""Action logic for CC environment extraction."""

load("@bazel_skylib//lib:shell.bzl", "shell")
load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cpp_toolchain")
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
load(
"//pycross/private/build:cc_toolchain_util.bzl",
Expand Down
4 changes: 2 additions & 2 deletions pycross/private/build/cc_toolchain_util.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
""" Adopted from rules_foreign_cc."""

load("@bazel_skylib//lib:collections.bzl", "collections")
load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES")
load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
load("@rules_cc//cc:action_names.bzl", "ACTION_NAMES")
load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cpp_toolchain")
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/always_build/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
2 changes: 1 addition & 1 deletion tests/e2e/build_cmake/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import %workspace%/../shared/.bazelrc.common
# For CMake debug output
build --action_env=RULES_PYCROSS_DEBUG=1

common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
import %workspace%/../shared/.bazelrc.cc
2 changes: 1 addition & 1 deletion tests/e2e/build_maturin/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import %workspace%/../shared/.bazelrc.common
# For Rust (maturin) builds
build --@llvm//config:experimental_stub_libgcc_s=True

common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
import %workspace%/../shared/.bazelrc.cc
2 changes: 1 addition & 1 deletion tests/e2e/build_meson/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import %workspace%/../shared/.bazelrc.common
# For Meson debug output
build --action_env=RULES_PYCROSS_DEBUG=1

common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
import %workspace%/../shared/.bazelrc.cc
6 changes: 3 additions & 3 deletions tests/e2e/build_pure_python/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import %workspace%/../shared/.bazelrc.common

common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
import %workspace%/../shared/.bazelrc.cc

# Test the newer venv bootstrap method with wheel builds
--@rules_python//python/config_settings:bootstrap_impl=script
--@rules_python//python/config_settings:venvs_site_packages=yes
build --@rules_python//python/config_settings:bootstrap_impl=script
build --@rules_python//python/config_settings:venvs_site_packages=yes
4 changes: 2 additions & 2 deletions tests/e2e/build_setuptools/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import %workspace%/../shared/.bazelrc.common

build --action_env=RULES_PYCROSS_DEBUG=1
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
import %workspace%/../shared/.bazelrc.cc

# Test the newer script bootstrap method with wheel builds
--@rules_python//python/config_settings:bootstrap_impl=script
build --@rules_python//python/config_settings:bootstrap_impl=script
2 changes: 1 addition & 1 deletion tests/e2e/cross_repo_build_target/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
2 changes: 1 addition & 1 deletion tests/e2e/gazelle_integration/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ import %workspace%/../shared/.bazelrc.common



common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
2 changes: 1 addition & 1 deletion tests/e2e/generate_lock/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
2 changes: 1 addition & 1 deletion tests/e2e/git_sources/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/local_wheel/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
2 changes: 1 addition & 1 deletion tests/e2e/namespace_pkgs/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/pdm_forks/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
2 changes: 1 addition & 1 deletion tests/e2e/pdm_workspace/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/poetry_forks/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
2 changes: 1 addition & 1 deletion tests/e2e/pylock_graphless/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
2 changes: 1 addition & 1 deletion tests/e2e/requirements/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/sdist_repo/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
2 changes: 0 additions & 2 deletions tests/e2e/shared/.bazelrc.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ common --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
common --repo_env=BAZEL_DO_NOT_DETECT_SWIFT_TOOLCHAIN=1
common --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1

common --incompatible_enable_cc_toolchain_resolution
common --incompatible_strict_action_env
common --nolegacy_external_runfiles
common --nosandbox_default_allow_network

common -c opt
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/simple_index/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
2 changes: 1 addition & 1 deletion tests/e2e/uv_conflicts/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/uv_cycle/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
2 changes: 1 addition & 1 deletion tests/e2e/uv_cycle_stress/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
2 changes: 1 addition & 1 deletion tests/e2e/uv_cycle_stress_mixed/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
2 changes: 1 addition & 1 deletion tests/e2e/uv_forked_build_tools/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
2 changes: 1 addition & 1 deletion tests/e2e/uv_forks/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
2 changes: 1 addition & 1 deletion tests/e2e/uv_markers/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user
2 changes: 1 addition & 1 deletion tests/e2e/uv_workspace/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import %workspace%/../shared/.bazelrc.common
common --disk_cache .cache
common --disk_cache=.cache
try-import %workspace%/.bazelrc.user
try-import %workspace%/../shared/.bazelrc.user

Expand Down
Loading