Skip to content

Commit

Permalink
feat: implement --build_python_zip pex (#324)
Browse files Browse the repository at this point in the history
### Type of change

- New feature or functionality (#236)

### Test plan

- New test cases added

---------

Co-authored-by: Matt Mackay <[email protected]>
  • Loading branch information
thesayyn and mattem authored Sep 4, 2024
1 parent 5142191 commit 7a9e4b2
Show file tree
Hide file tree
Showing 13 changed files with 475 additions and 1 deletion.
1 change: 1 addition & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ python.toolchain(
tools = use_extension("//py:extensions.bzl", "py_tools")
tools.rules_py_tools()
use_repo(tools, "rules_py_tools")
use_repo(tools, "rules_py_pex_2_3_1")

register_toolchains(
"@rules_py_tools//:all",
Expand Down
22 changes: 22 additions & 0 deletions docs/rules.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions examples/py_pex_binary/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
load("//py:defs.bzl", "py_binary", "py_pex_binary")

py_binary(
name = "binary",
srcs = ["say.py"],
data = ["data.txt"],
env = {
"TEST": "1"
},
deps = [
"@pypi_cowsay//:pkg",
"@bazel_tools//tools/python/runfiles",
],
)

py_pex_binary(
name = "py_pex_binary",
binary = ":binary",
inject_env = {
"TEST": "1"
}
)
1 change: 1 addition & 0 deletions examples/py_pex_binary/data.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Mooo!
28 changes: 28 additions & 0 deletions examples/py_pex_binary/say.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import cowsay
import sys
import os
from bazel_tools.tools.python.runfiles import runfiles

print("sys.path entries:")
for p in sys.path:
print(" ", p)

print("")
print("os.environ entries:")
print(" runfiles dir:", os.environ.get("RUNFILES_DIR"))
print(" injected env:", os.environ.get("TEST"))

print("")
print("dir info: ")
print(" current dir:", os.curdir)
print(" current dir (absolute):", os.path.abspath(os.curdir))


r = runfiles.Create()
data_path = r.Rlocation("aspect_rules_py/examples/py_pex_binary/data.txt")

print("")
print("runfiles lookup:")
print(" data.txt:", data_path)

cowsay.cow(open(data_path).read())
1 change: 1 addition & 0 deletions py/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ bzl_library(
"//py/private:py_venv",
"//py/private:py_wheel",
"//py/private:virtual",
"//py/private:py_pex_binary",
"@aspect_bazel_lib//lib:utils",
],
)
2 changes: 2 additions & 0 deletions py/defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ load("@aspect_bazel_lib//lib:utils.bzl", "propagate_common_rule_attributes")
load("//py/private:py_binary.bzl", _py_binary = "py_binary", _py_test = "py_test")
load("//py/private:py_executable.bzl", "determine_main")
load("//py/private:py_library.bzl", _py_library = "py_library")
load("//py/private:py_pex_binary.bzl", _py_pex_binary = "py_pex_binary")
load("//py/private:py_pytest_main.bzl", _py_pytest_main = "py_pytest_main")
load("//py/private:py_unpacked_wheel.bzl", _py_unpacked_wheel = "py_unpacked_wheel")
load("//py/private:virtual.bzl", _resolutions = "resolutions")
load("//py/private:py_venv.bzl", _py_venv = "py_venv")

py_pex_binary = _py_pex_binary
py_pytest_main = _py_pytest_main

py_venv = _py_venv
Expand Down
10 changes: 10 additions & 0 deletions py/private/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,16 @@ bzl_library(
visibility = ["//py:__subpackages__"],
)

bzl_library(
name = "py_pex_binary",
srcs = ["py_pex_binary.bzl"],
visibility = ["//py:__subpackages__"],
deps = [
":py_semantics",
"//py/private/toolchain:types",
],
)

bzl_library(
name = "virtual",
srcs = ["virtual.bzl"],
Expand Down
159 changes: 159 additions & 0 deletions py/private/py_pex_binary.bzl
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
"Create python zip file https://peps.python.org/pep-0441/ (PEX)"

load("@rules_python//python:defs.bzl", "PyInfo")
load("//py/private:py_semantics.bzl", _py_semantics = "semantics")
load("//py/private/toolchain:types.bzl", "PY_TOOLCHAIN")

def _runfiles_path(file, workspace):
if file.short_path.startswith("../"):
return file.short_path[3:]
else:
return workspace + "/" + file.short_path

exclude_paths = [
# following two lines will match paths we want to exclude in non-bzlmod setup
"toolchain",
"aspect_rules_py/py/tools/",
# these will match in bzlmod setup
"rules_python~~python~",
"aspect_rules_py~/py/tools/",
# these will match in bzlmod setup with --incompatible_use_plus_in_repo_names flag flipped.
"rules_python++python+",
"aspect_rules_py+/py/tools/"
]

# determines if the given file is a `distinfo`, `dep` or a `source`
# this required to allow PEX to put files into different places.
#
# --dep: into `<PEX_UNPACK_ROOT>/.deps/<name_of_the_package>`
# --distinfo: is only used for determining package metadata
# --source: into `<PEX_UNPACK_ROOT>/<relative_path_to_workspace_root>/<file_name>`
def _map_srcs(f, workspace):
dest_path = _runfiles_path(f, workspace)

# We exclude files from hermetic python toolchain.
for exclude in exclude_paths:
if dest_path.find(exclude) != -1:
return []

site_packages_i = f.path.find("site-packages")

# if path contains `site-packages` and there is only two path segments
# after it, it will be treated as third party dep.
# Here are some examples of path we expect and use and ones we ignore.
#
# Match: `external/rules_python~~pip~pypi_39_rtoml/site-packages/rtoml-0.11.0.dist-info/INSTALLER`
# Reason: It has two `/` after first `site-packages` substring.
#
# No Match: `external/rules_python~~pip~pypi_39_rtoml/site-packages/rtoml-0.11.0/src/mod/parse.py`
# Reason: It has three `/` after first `site-packages` substring.
if site_packages_i != -1 and f.path.count("/", site_packages_i) == 2:
if f.path.find("dist-info", site_packages_i) != -1:
return ["--distinfo={}".format(f.dirname)]
return ["--dep={}".format(f.dirname)]

# If the path does not have a `site-packages` in it, then put it into
# the standard runfiles tree.
elif site_packages_i == -1:
return ["--source={}={}".format(f.path, dest_path)]

return []

def _py_python_pex_impl(ctx):
py_toolchain = _py_semantics.resolve_toolchain(ctx)

binary = ctx.attr.binary
runfiles = binary[DefaultInfo].data_runfiles

output = ctx.actions.declare_file(ctx.attr.name + ".pex")

args = ctx.actions.args()

# Copy workspace name here to prevent ctx
# being transferred to the execution phase.
workspace_name = str(ctx.workspace_name)

args.add_all(
ctx.attr.inject_env.items(),
map_each = lambda e: "--inject-env={}={}".format(e[0], e[1]),
# this is needed to allow passing a lambda to map_each
allow_closure = True,
)

args.add_all(
binary[PyInfo].imports,
format_each = "--sys-path=%s"
)

args.add_all(
runfiles.files,
map_each = lambda f: _map_srcs(f, workspace_name),
uniquify = True,
# this is needed to allow passing a lambda (with workspace_name) to map_each
allow_closure = True,
)
args.add(binary[DefaultInfo].files_to_run.executable, format = "--executable=%s")
args.add(ctx.attr.python_shebang, format = "--python-shebang=%s")
args.add(py_toolchain.python, format = "--python=%s")

py_version = py_toolchain.interpreter_version_info
args.add_all(
[
constraint.format(major = py_version.major, minor = py_version.minor, patch = py_version.micro)
for constraint in ctx.attr.python_interpreter_constraints
],
format_each = "--python-version-constraint=%s"
)
args.add(output, format = "--output-file=%s")

ctx.actions.run(
executable = ctx.executable._pex,
inputs = runfiles.files,
arguments = [args],
outputs = [output],
mnemonic = "PyPex",
progress_message = "Building PEX binary %{label}",
)

return [
DefaultInfo(files = depset([output]), executable = output)
]


_attrs = dict({
"binary": attr.label(executable = True, cfg = "target", mandatory = True, doc = "A py_binary target"),
"inject_env": attr.string_dict(
doc = "Environment variables to set when running the pex binary.",
default = {},
),
"python_shebang": attr.string(default = "#!/usr/bin/env python3"),
"python_interpreter_constraints": attr.string_list(
default = ["CPython=={major}.{minor}.*"],
doc = """\
Python interpreter versions this PEX binary is compatible with. A list of semver strings.
The placeholder strings `{major}`, `{minor}`, `{patch}` can be used for gathering version
information from the hermetic python toolchain.
For example, to enforce same interpreter version that Bazel uses, following can be used.
```starlark
py_pex_binary
python_interpreter_constraints = [
"CPython=={major}.{minor}.{patch}"
]
)
```
"""),
"_pex": attr.label(executable = True, cfg = "exec", default = "//py/tools/pex")
})


py_pex_binary = rule(
doc = "Build a pex executable from a py_binary",
implementation = _py_python_pex_impl,
attrs = _attrs,
toolchains = [
PY_TOOLCHAIN
],
executable = True,
)
5 changes: 4 additions & 1 deletion py/private/run.tmpl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
# NB: we don't use a path from @bazel_tools//tools/sh:toolchain_type because that's configured for the exec
# configuration, while this script executes in the target configuration at runtime.

# This is a special comment for py_pex_binary to find the python entrypoint.
# __PEX_PY_BINARY_ENTRYPOINT__ {{ENTRYPOINT}}

{{BASH_RLOCATION_FN}}
runfiles_export_envvars

Expand Down Expand Up @@ -55,4 +58,4 @@ if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
hash -r 2> /dev/null
fi

exec "{{EXEC_PYTHON_BIN}}" {{INTERPRETER_FLAGS}} "$(rlocation {{ENTRYPOINT}})" "$@"
exec "{{EXEC_PYTHON_BIN}}" {{INTERPRETER_FLAGS}} "$(rlocation {{ENTRYPOINT}})" "$@"
9 changes: 9 additions & 0 deletions py/toolchains.bzl
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""Declare toolchains"""

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
load("//py/private/toolchain:autodetecting.bzl", _register_autodetecting_python_toolchain = "register_autodetecting_python_toolchain")
load("//py/private/toolchain:repo.bzl", "prerelease_toolchains_repo", "toolchains_repo")
load("//py/private/toolchain:tools.bzl", "TOOLCHAIN_PLATFORMS", "prebuilt_tool_repo")
Expand Down Expand Up @@ -32,3 +33,11 @@ def rules_py_toolchains(name = DEFAULT_TOOLS_REPOSITORY, register = True, is_pre

if register:
native.register_toolchains("@{}//:all".format(name))


http_file(
name = "rules_py_pex_2_3_1",
urls = ["https://files.pythonhosted.org/packages/e7/d0/fbda2a4d41d62d86ce53f5ae4fbaaee8c34070f75bb7ca009090510ae874/pex-2.3.1-py2.py3-none-any.whl"],
sha256 = "64692a5bf6f298403aab930d22f0d836ae4736c5bc820e262e9092fe8c56f830",
downloaded_file_path = "pex-2.3.1-py2.py3-none-any.whl",
)
15 changes: 15 additions & 0 deletions py/tools/pex/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
load("//py:defs.bzl", "py_binary", "py_unpacked_wheel")

py_unpacked_wheel(
name = "pex_unpacked",
src = "@rules_py_pex_2_3_1//file",
py_package_name = "pex"
)

py_binary(
name = "pex",
srcs = ["main.py"],
main = "main.py",
deps = [":pex_unpacked"],
visibility = ["//visibility:public"]
)
Loading

0 comments on commit 7a9e4b2

Please sign in to comment.