Skip to content

Commit 1d283fc

Browse files
alexeaglealexeagle
authored
cleanup: remove vendored copy of skylib (bazel-contrib#1003)
Following bazel-contrib#1001 we require that users install bazel-skylib, so we are now free to load from it.
1 parent 5f166c1 commit 1d283fc

File tree

13 files changed

+12
-393
lines changed

13 files changed

+12
-393
lines changed

‎BUILD.bazel

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ filegroup(
3535
"//gazelle:distribution",
3636
"//python:distribution",
3737
"//python/pip_install:distribution",
38-
"//third_party/github.com/bazelbuild/bazel-skylib/lib:distribution",
39-
"//third_party/github.com/bazelbuild/bazel-skylib/rules:distribution",
40-
"//third_party/github.com/bazelbuild/bazel-skylib/rules/private:distribution",
4138
"//tools:distribution",
4239
],
4340
visibility = [

‎docs/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ stardoc(
109109
deps = [
110110
":bazel_repo_tools",
111111
":pip_install_bzl",
112-
"//third_party/github.com/bazelbuild/bazel-skylib/lib:versions",
112+
"@bazel_skylib//lib:versions",
113113
],
114114
)
115115

@@ -122,7 +122,7 @@ stardoc(
122122
":bazel_repo_tools",
123123
":pip_install_bzl",
124124
":requirements_parser_bzl",
125-
"//third_party/github.com/bazelbuild/bazel-skylib/lib:versions",
125+
"@bazel_skylib//lib:versions",
126126
],
127127
)
128128

‎examples/multi_python_versions/WORKSPACE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ local_repository(
55
path = "../..",
66
)
77

8-
load("@rules_python//python/pip_install:repositories.bzl", "pip_install_dependencies")
9-
10-
pip_install_dependencies()
11-
128
load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_multi_toolchains")
139

1410
py_repositories()
1511

12+
load("@rules_python//python/pip_install:repositories.bzl", "pip_install_dependencies")
13+
14+
pip_install_dependencies()
15+
1616
default_python_version = "3.9"
1717

1818
python_register_multi_toolchains(

‎python/pip_install/repositories.bzl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
""
22

3+
load("@bazel_skylib//lib:versions.bzl", "versions")
34
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
45
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
56

6-
# Avoid a load from @bazel_skylib repository as users don't necessarily have it installed
7-
load("//third_party/github.com/bazelbuild/bazel-skylib/lib:versions.bzl", "versions")
8-
97
_RULE_DEPS = [
108
(
119
"pypi__build",

‎python/pip_install/tools/wheel_installer/wheel_installer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ def _generate_build_file_contents(
226226
textwrap.dedent(
227227
"""\
228228
load("@rules_python//python:defs.bzl", "py_library", "py_binary")
229-
load("@rules_python//third_party/github.com/bazelbuild/bazel-skylib/rules:copy_file.bzl", "copy_file")
229+
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
230230
231231
package(default_visibility = ["//visibility:public"])
232232

‎tests/compile_pip_requirements/WORKSPACE

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ local_repository(
33
path = "../..",
44
)
55

6+
load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
7+
8+
py_repositories()
9+
610
load("@rules_python//python/pip_install:repositories.bzl", "pip_install_dependencies")
711

812
pip_install_dependencies()
913

10-
load("@rules_python//python:repositories.bzl", "python_register_toolchains")
11-
1214
python_register_toolchains(
1315
name = "python39",
1416
python_version = "3.9",

‎third_party/github.com/bazelbuild/bazel-skylib/README.md

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎third_party/github.com/bazelbuild/bazel-skylib/lib/BUILD

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎third_party/github.com/bazelbuild/bazel-skylib/lib/versions.bzl

Lines changed: 0 additions & 128 deletions
This file was deleted.

‎third_party/github.com/bazelbuild/bazel-skylib/rules/BUILD

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy