Skip to content

Commit d08e374

Browse files
committed
Update bazel_skylib to have scope attr
1 parent a2055d3 commit d08e374

File tree

5 files changed

+37
-10
lines changed

5 files changed

+37
-10
lines changed

WORKSPACE

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ local_repository(
2525
path = ".",
2626
)
2727

28+
load("//python:repositories.bzl", "py_repositories", "python_register_multi_toolchains")
29+
30+
py_repositories()
31+
2832
load("//:internal_dev_deps.bzl", "rules_python_internal_deps")
2933

3034
rules_python_internal_deps()
@@ -69,9 +73,6 @@ load("//:internal_dev_setup.bzl", "rules_python_internal_setup")
6973
rules_python_internal_setup()
7074

7175
load("@pythons_hub//:versions.bzl", "PYTHON_VERSIONS")
72-
load("//python:repositories.bzl", "py_repositories", "python_register_multi_toolchains")
73-
74-
py_repositories()
7576

7677
python_register_multi_toolchains(
7778
name = "python",

examples/build_file_generation/WORKSPACE

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,19 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1818
# Define an http_archive rule that will download the below ruleset,
1919
# test the sha, and extract the ruleset to you local bazel cache.
2020

21+
http_archive(
22+
name = "bazel_skylib",
23+
sha256 = "6e78f0e57de26801f6f564fa7c4a48dc8b36873e416257a92bbb0937eeac8446",
24+
urls = [
25+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.8.2/bazel-skylib-1.8.2.tar.gz",
26+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.8.2/bazel-skylib-1.8.2.tar.gz",
27+
],
28+
)
29+
30+
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
31+
32+
bazel_skylib_workspace()
33+
2134
http_archive(
2235
name = "io_bazel_rules_go",
2336
sha256 = "9d72f7b8904128afb98d46bbef82ad7223ec9ff3718d419afb355fddd9f9484a",

gazelle/WORKSPACE

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@ workspace(name = "rules_python_gazelle_plugin")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44

5+
http_archive(
6+
name = "bazel_skylib",
7+
sha256 = "6e78f0e57de26801f6f564fa7c4a48dc8b36873e416257a92bbb0937eeac8446",
8+
urls = [
9+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.8.2/bazel-skylib-1.8.2.tar.gz",
10+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.8.2/bazel-skylib-1.8.2.tar.gz",
11+
],
12+
)
13+
14+
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
15+
16+
bazel_skylib_workspace()
17+
518
http_archive(
619
name = "io_bazel_rules_go",
720
sha256 = "9d72f7b8904128afb98d46bbef82ad7223ec9ff3718d419afb355fddd9f9484a",

python/config_settings/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,28 +245,28 @@ label_flag(
245245
bool_flag(
246246
name = "experimental_python_import_all_repositories",
247247
build_setting_default = True,
248-
# scope = "universal",
248+
scope = "universal",
249249
visibility = ["//visibility:public"],
250250
)
251251

252252
bool_flag(
253253
name = "build_python_zip",
254254
build_setting_default = config.build_python_zip_default,
255255
help = "Build python executable zip. Defaults to on on Windows, off on other platforms",
256-
# scope = "universal",
256+
scope = "universal",
257257
visibility = ["//visibility:public"],
258258
)
259259

260260
bool_flag(
261261
name = "incompatible_default_to_explicit_init_py",
262262
build_setting_default = False,
263-
# scope = "universal",
263+
scope = "universal",
264264
visibility = ["//visibility:public"],
265265
)
266266

267267
string_flag(
268268
name = "python_path",
269269
build_setting_default = "python",
270-
# scope = "universal",
270+
scope = "universal",
271271
visibility = ["//visibility:public"],
272272
)

python/private/py_repositories.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ def py_repositories(transition_settings = []):
6060
)
6161
http_archive(
6262
name = "bazel_skylib",
63-
sha256 = "d00f1389ee20b60018e92644e0948e16e350a7707219e7a390fb0a99b6ec9262",
63+
sha256 = "6e78f0e57de26801f6f564fa7c4a48dc8b36873e416257a92bbb0937eeac8446",
6464
urls = [
65-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.7.0/bazel-skylib-1.7.0.tar.gz",
66-
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.0/bazel-skylib-1.7.0.tar.gz",
65+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.8.2/bazel-skylib-1.8.2.tar.gz",
66+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.8.2/bazel-skylib-1.8.2.tar.gz",
6767
],
6868
)
6969
http_archive(

0 commit comments

Comments
 (0)