Skip to content

Commit 01196b4

Browse files
committed
Merge branch 'main' of https://github.com/bazel-contrib/rules_python into refactor.optimize.venv.namespace.packages
2 parents 776e184 + b3d9b42 commit 01196b4

5 files changed

Lines changed: 10 additions & 2 deletions

File tree

examples/wheel/private/wheel_utils.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ def _directory_writer_impl(ctx):
2828

2929
ctx.actions.run(
3030
outputs = [output],
31+
mnemonic = "PyDirWriter",
3132
arguments = [args],
3233
executable = ctx.executable._writer,
3334
)

gazelle/manifest/defs.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ def _sources_hash_impl(ctx):
184184
args.add_all(all_srcs)
185185
ctx.actions.run(
186186
outputs = [hash_file],
187+
mnemonic = "PyGazelleManifestHash",
187188
inputs = all_srcs,
188189
arguments = [args],
189190
executable = ctx.executable._hasher,

gazelle/modules_mapping/def.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ def _modules_mapping_impl(ctx):
4343

4444
ctx.actions.run(
4545
inputs = [whl],
46+
mnemonic = "PyGazelleModMapGen",
4647
outputs = [wheel_modules_mapping],
4748
executable = ctx.executable._generator,
4849
arguments = [args],
@@ -57,6 +58,7 @@ def _modules_mapping_impl(ctx):
5758

5859
ctx.actions.run(
5960
inputs = per_wheel_outputs,
61+
mnemonic = "PyGazelleModMapMerge",
6062
outputs = [modules_mapping],
6163
executable = ctx.executable._merger,
6264
arguments = [merge_args],

python/private/pypi/whl_library.bzl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,10 @@ def _whl_library_impl(rctx):
377377
#
378378
# Remove non-pipstar and config_load check when we release rules_python 2.
379379
if enable_pipstar:
380-
if rp_config.bazel_8_or_later:
380+
# Extracting .whl files requires Bazel 8.3.0 or later, so require a
381+
# minimum of Bazel 9.0.0 to ensure compatibilty with earlier versions
382+
# of Bazel 8.
383+
if rp_config.bazel_9_or_later:
381384
extract_path = whl_path
382385
else:
383386
extract_path = rctx.path(whl_path.basename + ".zip")
@@ -386,7 +389,7 @@ def _whl_library_impl(rctx):
386389
archive = extract_path,
387390
output = "site-packages",
388391
)
389-
if not rp_config.bazel_8_or_later:
392+
if not rp_config.bazel_9_or_later:
390393
rctx.delete(extract_path)
391394

392395
metadata = whl_metadata(

sphinxdocs/private/sphinx.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,7 @@ def _sphinx_inventory_impl(ctx):
498498
args.add(output)
499499
ctx.actions.run(
500500
executable = ctx.executable._builder,
501+
mnemonic = "SphinxInventoryBuilder",
501502
arguments = [args],
502503
inputs = depset([ctx.file.src]),
503504
outputs = [output],

0 commit comments

Comments
 (0)