Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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: 1 addition & 2 deletions python/private/common.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,6 @@ def create_py_info(
if PyInfo in target or (BuiltinPyInfo != None and BuiltinPyInfo in target):
py_info.merge(_get_py_info(target))

deps_transitive_sources = py_info.transitive_sources.build()
py_info.transitive_sources.add(required_py_files)

# We only look at data to calculate uses_shared_libraries, if it's already
Expand All @@ -457,7 +456,7 @@ def create_py_info(
if py_info.get_uses_shared_libraries():
break

return py_info.build(), deps_transitive_sources, py_info.build_builtin_py_info()
return py_info.build(), py_info.build_builtin_py_info()

def _get_py_info(target):
return target[PyInfo] if PyInfo in target or BuiltinPyInfo == None else target[BuiltinPyInfo]
Expand Down
10 changes: 1 addition & 9 deletions python/private/py_executable.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1838,7 +1838,7 @@ def _create_providers(
PyCcLinkParamsInfo(cc_info = cc_info),
)

py_info, deps_transitive_sources, builtin_py_info = create_py_info(
py_info, builtin_py_info = create_py_info(
ctx,
original_sources = original_sources,
required_py_files = required_py_files,
Expand All @@ -1848,14 +1848,6 @@ def _create_providers(
imports = imports,
)

# TODO(b/253059598): Remove support for extra actions; https://github.com/bazelbuild/bazel/issues/16455
listeners_enabled = _py_builtins.are_action_listeners_enabled(ctx)
if listeners_enabled:
_py_builtins.add_py_extra_pseudo_action(
ctx = ctx,
dependency_transitive_python_sources = deps_transitive_sources,
)

providers.append(py_info)
if builtin_py_info:
providers.append(builtin_py_info)
Expand Down
12 changes: 1 addition & 11 deletions python/private/py_library.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ load(
)
load(":version.bzl", "version")

_py_builtins = py_internal

LIBRARY_ATTRS = dicts.add(
COMMON_ATTRS,
PY_SRCS_ATTRS,
Expand Down Expand Up @@ -164,7 +162,7 @@ def py_library_impl(ctx, *, semantics):
imports, venv_symlinks = _get_imports_and_venv_symlinks(ctx, semantics)

cc_info = semantics.get_cc_info_for_library(ctx)
py_info, deps_transitive_sources, builtins_py_info = create_py_info(
py_info, builtins_py_info = create_py_info(
ctx,
original_sources = direct_sources,
required_py_files = required_py_files,
Expand All @@ -175,14 +173,6 @@ def py_library_impl(ctx, *, semantics):
venv_symlinks = venv_symlinks,
)

# TODO(b/253059598): Remove support for extra actions; https://github.com/bazelbuild/bazel/issues/16455
listeners_enabled = _py_builtins.are_action_listeners_enabled(ctx)
if listeners_enabled:
_py_builtins.add_py_extra_pseudo_action(
ctx = ctx,
dependency_transitive_python_sources = deps_transitive_sources,
)

providers = [
DefaultInfo(files = default_outputs, runfiles = runfiles),
py_info,
Expand Down