Skip to content

chore: simplify default import attrs on macros #40

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 1 commit into from
Jun 3, 2022
Merged

chore: simplify default import attrs on macros #40

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
9 changes: 6 additions & 3 deletions docs/rules.md
View file
Open in desktop

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

16 changes: 8 additions & 8 deletions py/defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ load("//py/private:py_binary.bzl", _py_binary = "py_binary", _py_test = "py_test
load("//py/private:py_library.bzl", _py_library = "py_library")
load("//py/private:py_wheel.bzl", "py_wheel_lib")

def py_library(name, **kwargs):
def py_library(name, imports = ["."], **kwargs):
"""Wrapper macro for the py_library rule, setting a default for imports

Args:
Expand All @@ -14,11 +14,11 @@ def py_library(name, **kwargs):
"""
_py_library(
name = name,
imports = kwargs.pop("imports", []) + ["."],
imports = imports,
**kwargs
)

def py_binary(name, srcs = [], main = None, **kwargs):
def py_binary(name, srcs = [], main = None, imports = ["."], **kwargs):
"""Wrapper macro for the py_binary rule, setting a default for imports.

It also creates a virtualenv to constrain the interpreter and packages used at runtime,
Expand All @@ -34,32 +34,32 @@ def py_binary(name, srcs = [], main = None, **kwargs):
name = name,
srcs = srcs,
main = main if main != None else srcs[0],
imports = kwargs.pop("imports", ["."]),
imports = imports,
**kwargs
)

_py_venv(
name = "%s.venv" % name,
deps = kwargs.pop("deps", []),
imports = kwargs.pop("imports", ["."]),
imports = imports,
srcs = srcs,
tags = ["manual"],
)

def py_test(name, main = None, srcs = [], **kwargs):
def py_test(name, main = None, srcs = [], imports = ["."], **kwargs):
"Identical to py_binary, but produces a target that can be used with `bazel test`."
_py_test(
name = name,
srcs = srcs,
main = main if main != None else srcs[0],
imports = kwargs.pop("imports", ["."]),
imports = imports,
**kwargs
)

_py_venv(
name = "%s.venv" % name,
deps = kwargs.pop("deps", []),
imports = kwargs.pop("imports", ["."]),
imports = imports,
srcs = srcs,
tags = ["manual"],
)
Expand Down