8000 Stop using deprecated depset.union API by pstradomski · Pull Request #180 · bazel-contrib/rules_python · GitHub
[go: up one dir, main page]
Skip to content

Stop using deprecated depset.union API #180

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

Merged
merged 2 commits into from
Apr 16, 2019
Merged

Stop using deprecated depset.union API #180

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4292d1b
Stop using deprecated depset.union() api.
pstradomski Apr 16, 2019
8fba6be
Switch to using Args api for building args instead of flattening the …
pstradomski Apr 16, 2019
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
60 changes: 26 additions & 34 deletions experimental/python/wheel.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ def _path_inside_wheel(input_file):
fail("input_file.path '%s' does not start with expected root '%s'" % (input_file.path, root))
return input_file.path[len(root):]

def _input_file_to_arg(input_file):
"""Converts a File object to string for --input_file argument to wheelmaker"""
return "%s;%s" % (_path_inside_wheel(input_file), input_file.path)

def _py_package_impl(ctx):
inputs = depset(
transitive = [dep[DefaultInfo].data_runfiles.files for dep in ctx.attr.deps] +
Expand Down Expand Up @@ -83,29 +87,23 @@ def _py_wheel_impl(ctx):
ctx.attr.platform,
]) + ".whl")

inputs = depset(
inputs_to_package = depset(
direct = ctx.files.deps,
)

arguments = [
"--name",
ctx.attr.distribution,
"--version",
ctx.attr.version,
"--python_tag",
ctx.attr.python_tag,
"--abi",
ctx.attr.abi,
"--platform",
ctx.attr.platform,
"--out",
outfile.path,
]
# Inputs to this rule which are not to be packaged.
# Currently this is only the description file (if used).
other_inputs = []

args = ctx.actions.args()
args.add("--name", ctx.attr.distribution)
args.add("--version", ctx.attr.version)
args.add("--python_tag", ctx.attr.python_tag)
args.add("--abi", ctx.attr.abi)
args.add("--platform", ctx.attr.platform)
args.add("--out", outfile.path)

# TODO: Use args api instead of flattening the depset.
for input_file in inputs.to_list():
arguments.append("--input_file")
arguments.append("%s;%s" % (_path_inside_wheel(input_file), input_file.path))
args.add_all(inputs_to_package, format_each = "--input_file=%s", map_each = _input_file_to_arg)

extra_headers = []
if ctx.attr.author:
Expand All @@ -118,36 +116,30 @@ def _py_wheel_impl(ctx):
extra_headers.append("License: %s" % ctx.attr.license)

for h in extra_headers:
arguments.append("--header")
arguments.append(h)
args.add("--header", h)

for c in ctx.attr.classifiers:
arguments.append("--classifier")
arguments.append(c)
args.add("--classifier", c)

for r in ctx.attr.requires:
arguments.append("--requires")
arguments.append(r)
args.add("--requires", r)

for option, requirements in ctx.attr.extra_requires.items():
for r in requirements:
arguments.append("--extra_requires")
arguments.append(r + ";" + option)
args.add("--extra_requires", r + ";" + option)

for name, ref in ctx.attr.console_scripts.items():
arguments.append("--console_script")
arguments.append(name + " = " + ref)
args.add("--console_script", name + " = " + ref)

if ctx.attr.description_file:
description_file = ctx.file.description_file
arguments.append("--description_file")
arguments.append(description_file.path)
inputs = inputs.union([description_file])
args.add("--description_file", description_file)
other_inputs.append(description_file)

ctx.actions.run(
inputs = inputs,
inputs = depset(direct = other_inputs, transitive = [inputs_to_package]),
outputs = [outfile],
arguments = arguments,
arguments = [args],
executable = ctx.executable._wheelmaker,
progress_message = "Building wheel",
)
Expand Down
0