Skip to content

Commit 1af5bba

Browse files
committed
remove: is_bazel_7_4_or_greater
1 parent eb60863 commit 1af5bba

8 files changed

Lines changed: 4 additions & 48 deletions

File tree

python/private/BUILD.bazel

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,6 @@ bzl_library(
194194
srcs = ["full_version.bzl"],
195195
)
196196

197-
bzl_library(
198-
name = "glob_excludes_bzl",
199-
srcs = ["glob_excludes.bzl"],
200-
deps = [":util_bzl"],
201-
)
202-
203197
bzl_library(
204198
name = "internal_config_repo_bzl",
205199
srcs = ["internal_config_repo.bzl"],

python/private/glob_excludes.bzl

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

python/private/hermetic_runtime_repo_setup.bzl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ load("@rules_cc//cc:cc_library.bzl", "cc_library")
1818
load("//python:py_runtime.bzl", "py_runtime")
1919
load("//python:py_runtime_pair.bzl", "py_runtime_pair")
2020
load("//python/cc:py_cc_toolchain.bzl", "py_cc_toolchain")
21-
load(":glob_excludes.bzl", "glob_excludes")
2221
load(":py_exec_tools_toolchain.bzl", "py_exec_tools_toolchain")
2322
load(":version.bzl", "version")
2423

@@ -82,7 +81,7 @@ def define_hermetic_runtime_toolchain_impl(
8281
"lib/python{major}.{minor}*/**/tests/**".format(**version_dict),
8382
# During pyc creation, temp files named *.pyc.NNN are created
8483
"**/__pycache__/*.pyc.*",
85-
] + glob_excludes.version_dependent_exclusions() + extra_files_glob_exclude,
84+
] + extra_files_glob_exclude,
8685
),
8786
)
8887
cc_import(

python/private/pypi/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ bzl_library(
7474
srcs = ["deps.bzl"],
7575
deps = [
7676
"//python/private:bazel_tools_bzl",
77-
"//python/private:glob_excludes_bzl",
7877
],
7978
)
8079

python/private/pypi/deps.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ py_library(
115115
"**/*.dist-info/RECORD",
116116
"BUILD",
117117
"WORKSPACE",
118-
] + glob_excludes.version_dependent_exclusions()),
118+
]),
119119
# This makes this directory a top-level in the python import
120120
# search path for anything that depends on this.
121121
imports = ["."],

python/private/pypi/whl_library_targets.bzl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
1818
load("//python:py_binary.bzl", "py_binary")
1919
load("//python:py_library.bzl", "py_library")
20-
load("//python/private:glob_excludes.bzl", "glob_excludes")
2120
load("//python/private:normalize_name.bzl", "normalize_name")
2221
load(":env_marker_setting.bzl", "env_marker_setting")
2322
load(
@@ -339,7 +338,7 @@ def whl_library_targets(
339338
# of generated files produced when wheels are installed. The file is ignored to avoid
340339
# Bazel caching issues.
341340
"**/*.dist-info/RECORD",
342-
] + glob_excludes.version_dependent_exclusions()
341+
]
343342
for item in data_exclude:
344343
if item not in _data_exclude:
345344
_data_exclude.append(item)

python/private/util.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,3 @@ def add_tag(attrs, tag):
6969
attrs["tags"] = tags + [tag]
7070
else:
7171
attrs["tags"] = [tag]
72-
73-
IS_BAZEL_7_4_OR_HIGHER = hasattr(native, "legacy_globals")

tests/pypi/whl_library_targets/whl_library_targets_tests.bzl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
""
1616

1717
load("@rules_testing//lib:test_suite.bzl", "test_suite")
18-
load("//python/private:glob_excludes.bzl", "glob_excludes") # buildifier: disable=bzl-visibility
1918
load(
2019
"//python/private/pypi:whl_library_targets.bzl",
2120
"whl_library_targets",
@@ -275,7 +274,7 @@ def _test_whl_and_library_deps_from_requires(env):
275274
"**/*.pyc",
276275
"**/*.pyc.*",
277276
"**/*.dist-info/RECORD",
278-
] + glob_excludes.version_dependent_exclusions(),
277+
],
279278
),
280279
# pyi call
281280
_glob_call(["site-packages/**/*.pyi"], allow_empty = True),

0 commit comments

Comments
 (0)