Skip to content
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.

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

Turn //python/private into a package. #555

Merged
merged 3 commits into from
Oct 26, 2021
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion docs/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ bzl_library(
name = "defs",
srcs = [
"//python:defs.bzl",
"//python:private/reexports.bzl",
"//python/private:reexports.bzl",
],
deps = [":bazel_python_tools"],
)
Expand Down
11 changes: 2 additions & 9 deletions python/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ filegroup(
"//python/constraints:distribution",
"//python/legacy_pip_import:distribution",
"//python/runfiles:distribution",
"//python/private:distribution",
],
visibility = ["//:__pkg__"],
)
Expand All @@ -48,8 +49,8 @@ filegroup(
"defs.bzl",
"packaging.bzl",
"pip.bzl",
"private/reexports.bzl",
"whl.bzl",
"//python/private:bzl",
],
visibility = ["//:__pkg__"],
)
Expand All @@ -61,14 +62,6 @@ exports_files([
"python.bzl", # Deprecated, please use defs.bzl
])

# Needed to define bzl_library targets for docgen. (We don't define the
# bzl_library target here because it'd give our users a transitive dependency
# on Skylib.)
exports_files(
["private/reexports.bzl"],
visibility = ["//docs:__pkg__"],
)

# This target can be used to inspect the current Python major version. To use,
# put it in the `flag_values` attribute of a `config_setting` and test it
# against the values "PY2" or "PY3". It will always match one or the other.
Expand Down
2 changes: 1 addition & 1 deletion python/defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ migrated to Starlark, their implementations will be moved here.

load("@bazel_tools//tools/python:srcs_version.bzl", _find_requirements = "find_requirements")
load("@bazel_tools//tools/python:toolchain.bzl", _py_runtime_pair = "py_runtime_pair")
load(":private/reexports.bzl", "internal_PyInfo", "internal_PyRuntimeInfo")
load("//python/private:reexports.bzl", "internal_PyInfo", "internal_PyRuntimeInfo")

# Exports of native-defined providers.

Expand Down
41 changes: 41 additions & 0 deletions python/private/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Copyright 2021 The Bazel Authors. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

licenses(["notice"]) # Apache 2.0

filegroup(
name = "distribution",
srcs = glob(["**"]),
visibility = ["//python:__pkg__"],
)

# Filegroup of bzl files that can be used by downstream rules for documentation generation
# Using a filegroup rather than bzl_library to not give a transitive dependency on Skylib
filegroup(
name = "bzl",
srcs = [
"reexports.bzl",
],
visibility = ["//python:__pkg__"],
)

# Needed to define bzl_library targets for docgen. (We don't define the
# bzl_library target here because it'd give our users a transitive dependency
# on Skylib.)
exports_files(
[
"reexports.bzl",
],
visibility = ["//docs:__pkg__"],
)