chore: Update Bazel support: drop 5, minimum 6.2, current 7.0 (#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 #1069
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 84df9b7..d9dd618 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -21,8 +21,8 @@
.minimum_supported_version: &minimum_supported_version
# For testing minimum supported version.
# NOTE: Keep in sync with //:version.bzl
- bazel: 5.4.0
- skip_in_bazel_downstream_pipeline: "Bazel 5 required"
+ bazel: 6.2.0
+ skip_in_bazel_downstream_pipeline: "Bazel 6 required"
.minimum_supported_bzlmod_version: &minimum_supported_bzlmod_version
bazel: 6.2.0 # test minimum supported version of bazel for bzlmod tests
.reusable_config: &reusable_config
@@ -64,10 +64,7 @@
- //tests:version_3_9_test
- //tests:version_default_test
.pystar_base: &pystar_base
- # TODO: Change to "7.x" once Bazel 7 is available
- # https://github.com/bazelbuild/bazel/commit/f3aafea59ae021c6a12086cb2cd34c5fa782faf1
- # is available in rolling.
- bazel: "last_rc"
+ bazel: "7.x"
environment:
RULES_PYTHON_ENABLE_PYSTAR: "1"
test_flags:
diff --git a/.bazelignore b/.bazelignore
index f50a8b8..9104609 100644
--- a/.bazelignore
+++ b/.bazelignore
@@ -13,7 +13,10 @@
examples/bzlmod/bazel-bzlmod
examples/bzlmod/other_module/bazel-other_module
examples/bzlmod_build_file_generation/bazel-bzlmod_build_file_generation
+examples/multi_python_versions/bazel-multi_python_versions
examples/pip_parse/bazel-pip_parse
+examples/pip_parse_vendored/bazel-pip_parse_vendored
examples/py_proto_library/bazel-py_proto_library
+tests/compile_pip_requirements/bazel-compile_pip_requirements
tests/ignore_root_user_error/bazel-ignore_root_user_error
tests/pip_repository_entry_points/bazel-pip_repository_entry_points
diff --git a/.bazelversion b/.bazelversion
index 6abaeb2..66ce77b 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-6.2.0
+7.0.0
diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel
index 35c88cc..e11728e 100644
--- a/examples/BUILD.bazel
+++ b/examples/BUILD.bazel
@@ -11,57 +11,7 @@
# 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.
-load("//tools/bazel_integration_test:bazel_integration_test.bzl", "bazel_integration_test")
package(default_visibility = ["//visibility:public"])
licenses(["notice"]) # Apache 2.0
-
-bazel_integration_test(
- name = "build_file_generation_example",
- timeout = "long",
-)
-
-bazel_integration_test(
- name = "bzlmod_build_file_generation_example",
- timeout = "long",
-)
-
-bazel_integration_test(
- name = "pip_parse_example",
- timeout = "long",
-)
-
-bazel_integration_test(
- name = "pip_parse_vendored_example",
- timeout = "long",
- tags = ["fix-windows"],
-)
-
-bazel_integration_test(
- name = "pip_repository_annotations_example",
- timeout = "long",
-)
-
-bazel_integration_test(
- name = "py_proto_library_example",
- timeout = "long",
-)
-
-bazel_integration_test(
- name = "py_proto_library_example_bzlmod",
- timeout = "long",
- bzlmod = True,
- dirname = "py_proto_library",
-)
-
-bazel_integration_test(
- name = "multi_python_versions_example",
- timeout = "long",
-)
-
-bazel_integration_test(
- name = "bzlmod_example",
- bzlmod = True,
- override_bazel_version = "6.2.0",
-)
diff --git a/version.bzl b/version.bzl
index bf6f822..bcc2b20 100644
--- a/version.bzl
+++ b/version.bzl
@@ -17,11 +17,11 @@
# against.
# This version should be updated together with the version of Bazel
# in .bazelversion.
-BAZEL_VERSION = "6.2.0"
+BAZEL_VERSION = "7.0.0"
# NOTE: Keep in sync with .bazelci/presubmit.yml
# This is the minimum supported bazel version, that we have some tests for.
-MINIMUM_BAZEL_VERSION = "5.4.0"
+MINIMUM_BAZEL_VERSION = "6.2.0"
# Versions of Bazel which users should be able to use.
# Ensures we don't break backwards-compatibility,
