8000 chore: Update Bazel support: drop 5, minimum 6.2, current 7.0 (#1613) · tanan/rules_python@ee0a51e · GitHub
[go: up one dir, main page]
Skip to content

Commit ee0a51e

Browse files
rickeylevrickeylev
authored
chore: Update Bazel support: drop 5, minimum 6.2, current 7.0 (bazel-contrib#1613)
With the release of Bazel 7, support for 5 is no longer necessary. Also deletes all the integration tests of the examples. They were broken when run from the main repo, and CI was only building them, not running them, as part of the main repo due to having `--test_tag_filters=-integration-test`. CI runs them separately in their own workspace. Work towards bazel-contrib#1069
1 parent 94c89e6 commit ee0a51e

File tree

5 files changed

+9
-59
lines changed

5 files changed

+9
-59
lines changed

‎.bazelci/presubmit.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ buildifier:
2121
.minimum_supported_version: &minimum_supported_version
2222
# For testing minimum supported version.
2323
# NOTE: Keep in sync with //:version.bzl
24-
bazel: 5.4.0
25-
skip_in_bazel_downstream_pipeline: "Bazel 5 required"
24+
bazel: 6.2.0
25+
skip_in_bazel_downstream_pipeline: "Bazel 6 required"
2626
.minimum_supported_bzlmod_version: &minimum_supported_bzlmod_version
2727
bazel: 6.2.0 # test minimum supported version of bazel for bzlmod tests
2828
.reusable_config: &reusable_config
@@ -64,10 +64,7 @@ buildifier:
6464
- //tests:version_3_9_test
6565
- //tests:version_default_test
6666
.pystar_base: &pystar_base
67-
# TODO: Change to "7.x" once Bazel 7 is available
68-
# https://github.com/bazelbuild/bazel/commit/f3aafea59ae021c6a12086cb2cd34c5fa782faf1
69-
# is available in rolling.
70-
bazel: "last_rc"
67+
bazel: "7.x"
7168
environment:
7269
RULES_PYTHON_ENABLE_PYSTAR: "1"
7370
test_flags:

‎.bazelignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ bazel-testlogs
1313
examples/bzlmod/bazel-bzlmod
1414
examples/bzlmod/other_module/bazel-other_module
1515
examples/bzlmod_build_file_generation/bazel-bzlmod_build_file_generation
16+
examples/multi_python_versions/bazel-multi_python_versions
1617
examples/pip_parse/bazel-pip_parse
18+
examples/pip_parse_vendored/bazel-pip_parse_vendored
1719
examples/py_proto_library/bazel-py_proto_library
20+
tests/compile_pip_requirements/bazel-compile_pip_requirements
1821
tests/ignore_root_user_error/bazel-ignore_root_user_error
1922
tests/pip_repository_entry_points/bazel-pip_repository_entry_points

‎.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.2.0
1+
7.0.0

‎examples/BUILD.bazel

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -11,57 +11,7 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
load("//tools/bazel_integration_test:bazel_integration_test.bzl", "bazel_integration_test")
1514

1615
package(default_visibility = ["//visibility:public"])
1716

1817
licenses(["notice"]) # Apache 2.0
19-
20-
bazel_integration_test(
21-
name = "build_file_generation_example",
22-
timeout = "long",
23-
)
24-
25-
bazel_integration_test(
26-
name = "bzlmod_build_file_generation_example",
27-
timeout = "long",
28-
)
29-
30-
bazel_integration_test(
31-
name = "pip_parse_example",
32-
timeout = "long",
33-
)
34-
35-
bazel_integration_test(
36-
name = "pip_parse_vendored_example",
37-
timeout = "long",
38-
tags = ["fix-windows"],
39-
)
40-
41-
bazel_integration_test(
42-
name = "pip_repository_annotations_example",
43-
timeout = "long",
44-
)
45-
46-
bazel_integration_test(
47-
name = "py_proto_library_example",
48-
timeout = "long",
49-
)
50-
51-
bazel_integration_test(
52-
name = "py_proto_library_example_bzlmod",
53-
timeout = "long",
54-
bzlmod = True,
55-
dirname = "py_proto_library",
56-
)
57-
58-
bazel_integration_test(
59-
name = "multi_python_versions_example",
60-
timeout = "long",
61-
)
62-
63-
bazel_integration_test(
64-
name = "bzlmod_example",
65-
bzlmod = True,
66-
override_bazel_version = "6.2.0",
67-
)

‎version.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
# against.
1818
# This version should be updated together with the version of Bazel
1919
# in .bazelversion.
20-
BAZEL_VERSION = "6.2.0"
20+
BAZEL_VERSION = "7.0.0"
2121

2222
# NOTE: Keep in sync with .bazelci/presubmit.yml
2323
# This is the minimum supported bazel version, that we have some tests for.
24-
MINIMUM_BAZEL_VERSION = "5.4.0"
24+
MINIMUM_BAZEL_VERSION = "6.2.0"
2525

2626
# Versions of Bazel which users should be able to use.
2727
# Ensures we don't break backwards-compatibility,

0 commit comments

Comments
 (0)
0