Skip to content

Commit 8cc364d

Browse files
aignasaignas
authored
Merge branch 'main' into renovate/configure
2 parents f778dbd + 3a927ee commit 8cc364d

File tree

691 files changed

+20688
-7198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

691 files changed

+20688
-7198
lines changed

‎.bazelci/presubmit.yml‎

Lines changed: 44 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,11 @@ buildifier:
5151
test_flags:
5252
- "--noenable_bzlmod"
5353
- "--enable_workspace"
54+
- "--test_tag_filters=-integration-test"
5455
build_flags:
5556
- "--noenable_bzlmod"
5657
- "--enable_workspace"
58+
- "--build_tag_filters=-integration-test"
5759
bazel: 7.x
5860
.common_bazelinbazel_config: &common_bazelinbazel_config
5961
build_flags:
@@ -78,33 +80,31 @@ buildifier:
7880
coverage_targets:
7981
- //tests:my_lib_3_10_test
8082
- //tests:my_lib_3_11_test
81-
- //tests:my_lib_3_8_test
8283
- //tests:my_lib_3_9_test
8384
- //tests:my_lib_default_test
8485
- //tests:version_3_10_test
8586
- //tests:version_3_11_test
86-
- //tests:version_3_8_test
8787
- //tests:version_3_9_test
8888
- //tests:version_default_test
8989
tasks:
9090
gazelle_extension_min:
9191
<<: *common_workspace_flags_min_bazel
9292
<<: *minimum_supported_version
93-
name: "Gazelle: workspace, minumum supported Bazel version"
94-
platform: ubuntu2004
93+
name: "Gazelle: workspace, minimum supported Bazel version"
94+
platform: ubuntu2204
9595
build_targets: ["//..."]
9696
test_targets: ["//..."]
9797
working_directory: gazelle
9898
gazelle_extension_workspace:
9999
<<: *common_workspace_flags
100100
name: "Gazelle: workspace"
101-
platform: ubuntu2004
101+
platform: ubuntu2204
102102
build_targets: ["//..."]
103103
test_targets: ["//..."]
104104
working_directory: gazelle
105105
gazelle_extension:
106106
name: "Gazelle: default settings"
107-
platform: ubuntu2004
107+
platform: ubuntu2204
108108
build_targets: ["//..."]
109109
test_targets: ["//..."]
110110
working_directory: gazelle
@@ -114,28 +114,28 @@ tasks:
114114
<<: *reusable_config
115115
<<: *common_workspace_flags_min_bazel
116116
name: "Default: Ubuntu, workspace, minimum Bazel"
117-
platform: ubuntu2004
117+
platform: ubuntu2204
118118

119119
ubuntu_min_bzlmod:
120120
<<: *minimum_supported_version
121121
<<: *reusable_config
122122
name: "Default: Ubuntu, bzlmod, minimum Bazel"
123-
platform: ubuntu2004
123+
platform: ubuntu2204
124124
bazel: 7.x
125125
ubuntu:
126126
<<: *reusable_config
127127
name: "Default: Ubuntu"
128-
platform: ubuntu2004
128+
platform: ubuntu2204
129129
ubuntu_upcoming:
130130
<<: *reusable_config
131131
name: "Default: Ubuntu, upcoming Bazel"
132-
platform: ubuntu2004
132+
platform: ubuntu2204
133133
bazel: last_rc
134134
ubuntu_workspace:
135135
<<: *reusable_config
136136
<<: *common_workspace_flags
137137
name: "Default: Ubuntu, workspace"
138-
platform: ubuntu2004
138+
platform: ubuntu2204
139139
mac_workspace:
140140
<<: *reusable_config
141141
<<: *common_workspace_flags
@@ -185,7 +185,7 @@ tasks:
185185
<<: *minimum_supported_version
186186
<<: *reusable_config
187187
name: "RBE: Ubuntu, minimum Bazel"
188-
platform: rbe_ubuntu2004
188+
platform: rbe_ubuntu2204
189189
build_flags:
190190
# BazelCI sets --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1,
191191
# which prevents cc toolchain autodetection from working correctly
@@ -203,7 +203,7 @@ tasks:
203203
rbe:
204204
<<: *reusable_config
205205
name: "RBE: Ubuntu"
206-
platform: rbe_ubuntu2004
206+
platform: rbe_ubuntu2204
207207
# TODO @aignas 2024-12-11: get the RBE working in CI for bazel 8.0
208208
# See https://github.com/bazelbuild/rules_python/issues/2499
209209
bazel: 7.x
@@ -217,13 +217,13 @@ tasks:
217217
<<: *common_workspace_flags_min_bazel
218218
name: "examples/build_file_generation: Ubuntu, workspace, minimum Bazel"
219219
working_directory: examples/build_file_generation
220-
platform: ubuntu2004
220+
platform: ubuntu2204
221221
integration_test_build_file_generation_ubuntu_workspace:
222222
<<: *reusable_build_test_all
223223
<<: *common_workspace_flags
224224
name: "examples/build_file_generation: Ubuntu, workspace"
225225
working_directory: examples/build_file_generation
226-
platform: ubuntu2004
226+
platform: ubuntu2204
227227
integration_test_build_file_generation_debian_workspace:
228228
<<: *reusable_build_test_all
229229
<<: *common_workspace_flags
@@ -249,21 +249,21 @@ tasks:
249249
coverage_targets: ["//:test"]
250250
name: "examples/bzlmod: Ubuntu, minimum Bazel"
251251
working_directory: examples/bzlmod
252-
platform: ubuntu2004
252+
platform: ubuntu2204
253253
bazel: 7.x
254254
integration_test_bzlmod_ubuntu:
255255
<<: *reusable_build_test_all
256256
<<: *coverage_targets_example_bzlmod
257257
name: "examples/bzlmod: Ubuntu"
258258
working_directory: examples/bzlmod
259-
platform: ubuntu2004
259+
platform: ubuntu2204
260260
bazel: 7.x
261261
integration_test_bzlmod_ubuntu_upcoming:
262262
<<: *reusable_build_test_all
263263
<<: *coverage_targets_example_bzlmod
264264
name: "examples/bzlmod: Ubuntu, upcoming Bazel"
265265
working_directory: examples/bzlmod
266-
platform: ubuntu2004
266+
platform: ubuntu2204
267267
bazel: last_rc
268268
integration_test_bzlmod_debian:
269269
<<: *reusable_build_test_all
@@ -272,6 +272,15 @@ tasks:
272272
working_directory: examples/bzlmod
273273
platform: debian11
274274
bazel: 7.x
275+
integration_test_bzlmod_ubuntu_vendor:
276+
<<: *reusable_build_test_all
277+
name: "examples/bzlmod: bazel vendor"
278+
working_directory: examples/bzlmod
279+
platform: ubuntu2204
280+
shell_commands:
281+
- "bazel vendor --vendor_dir=./vendor //..."
282+
- "bazel build --vendor_dir=./vendor //..."
283+
- "rm -rf ./vendor"
275284
integration_test_bzlmod_macos:
276285
<<: *reusable_build_test_all
277286
<<: *coverage_targets_example_bzlmod
@@ -307,19 +316,19 @@ tasks:
307316
<<: *coverage_targets_example_bzlmod_build_file_generation
308317
name: "examples/bzlmod_build_file_generation: Ubuntu, minimum Bazel"
309318
working_directory: examples/bzlmod_build_file_generation
310-
platform: ubuntu2004
319+
platform: ubuntu2204
311320
bazel: 7.x
312321
integration_test_bzlmod_generation_build_files_ubuntu:
313322
<<: *reusable_build_test_all
314323
<<: *coverage_targets_example_bzlmod_build_file_generation
315324
name: "examples/bzlmod_build_file_generation: Ubuntu"
316325
working_directory: examples/bzlmod_build_file_generation
317-
platform: ubuntu2004
326+
platform: ubuntu2204
318327
integration_test_bzlmod_generation_build_files_ubuntu_run:
319328
<<: *reusable_build_test_all
320329
name: "examples/bzlmod_build_file_generation: Ubuntu, Gazelle and pip"
321330
working_directory: examples/bzlmod_build_file_generation
322-
platform: ubuntu2004
331+
platform: ubuntu2204
323332
shell_commands:
324333
- "bazel run //:gazelle_python_manifest.update"
325334
- "bazel run //:gazelle -- update"
@@ -338,7 +347,7 @@ tasks:
338347
integration_test_bzlmod_build_file_generation_windows:
339348
<<: *reusable_build_test_all
340349
# coverage is not supported on Windows
341-
name: "examples/bzlmod_build_file_generateion: Windows"
350+
name: "examples/bzlmod_build_file_generation: Windows"
342351
working_directory: examples/bzlmod_build_file_generation
343352
platform: windows
344353

@@ -348,7 +357,7 @@ tasks:
348357
<<: *coverage_targets_example_multi_python
349358
name: "examples/multi_python_versions: Ubuntu, workspace"
350359
working_directory: examples/multi_python_versions
351-
platform: ubuntu2004
360+
platform: ubuntu2204
352361
integration_test_multi_python_versions_debian_workspace:
353362
<<: *reusable_build_test_all
354363
<<: *common_workspace_flags
@@ -377,19 +386,19 @@ tasks:
377386
<<: *reusable_build_test_all
378387
name: "examples/pip_parse: Ubuntu, workspace, minimum supported Bazel version"
379388
working_directory: examples/pip_parse
380-
platform: ubuntu2004
389+
platform: ubuntu2204
381390
integration_test_pip_parse_ubuntu_min_bzlmod:
382391
<<: *minimum_supported_version
383392
<<: *reusable_build_test_all
384393
name: "examples/pip_parse: Ubuntu, bzlmod, minimum supported Bazel version"
385394
working_directory: examples/pip_parse
386-
platform: ubuntu2004
395+
platform: ubuntu2204
387396
bazel: 7.x
388397
integration_test_pip_parse_ubuntu:
389398
<<: *reusable_build_test_all
390399
name: "examples/pip_parse: Ubuntu"
391400
working_directory: examples/pip_parse
392-
platform: ubuntu2004
401+
platform: ubuntu2204
393402
integration_test_pip_parse_debian:
394403
<<: *reusable_build_test_all
395404
name: "examples/pip_parse: Debian"
@@ -412,13 +421,13 @@ tasks:
412421
<<: *reusable_build_test_all
413422
name: "examples/pip_parse_vendored: Ubuntu, workspace, minimum Bazel"
414423
working_directory: examples/pip_parse_vendored
415-
platform: ubuntu2004
424+
platform: ubuntu2204
416425
integration_test_pip_parse_vendored_ubuntu:
417426
<<: *reusable_build_test_all
418427
<<: *common_workspace_flags
419428
name: "examples/pip_parse_vendored: Ubuntu"
420429
working_directory: examples/pip_parse_vendored
421-
platform: ubuntu2004
430+
platform: ubuntu2204
422431
integration_test_pip_parse_vendored_debian:
423432
<<: *reusable_build_test_all
424433
<<: *common_workspace_flags
@@ -441,7 +450,7 @@ tasks:
441450
<<: *common_workspace_flags
442451
name: "examples/py_proto_library: Ubuntu, workspace"
443452
working_directory: examples/py_proto_library
444-
platform: ubuntu2004
453+
platform: ubuntu2204
445454
integration_test_py_proto_library_debian_workspace:
446455
<<: *reusable_build_test_all
447456
<<: *common_workspace_flags
@@ -466,7 +475,7 @@ tasks:
466475
<<: *common_workspace_flags
467476
name: "examples/pip_repository_annotations: Ubuntu, workspace"
468477
working_directory: examples/pip_repository_annotations
469-
platform: ubuntu2004
478+
platform: ubuntu2204
470479
integration_test_pip_repository_annotations_debian_workspace:
471480
<<: *reusable_build_test_all
472481
<<: *common_workspace_flags
@@ -489,7 +498,7 @@ tasks:
489498
integration_test_bazelinbazel_ubuntu:
490499
<<: *common_bazelinbazel_config
491500
name: "tests/integration bazel-in-bazel: Ubuntu"
492-
platform: ubuntu2004
501+
platform: ubuntu2204
493502
integration_test_bazelinbazel_debian:
494503
<<: *common_bazelinbazel_config
495504
name: "tests/integration bazel-in-bazel: Debian"
@@ -499,7 +508,7 @@ tasks:
499508
<<: *reusable_build_test_all
500509
name: "compile_pip_requirements: Ubuntu"
501510
working_directory: tests/integration/compile_pip_requirements
502-
platform: ubuntu2004
511+
platform: ubuntu2204
503512
shell_commands:
504513
# Make a change to the locked requirements and then assert that //:requirements.update does the
505514
# right thing.
@@ -587,23 +596,23 @@ tasks:
587596
<<: *common_workspace_flags_min_bazel
588597
name: "compile_pip_requirements_test_from_external_repo: Ubuntu, workspace, minimum Bazel"
589598
working_directory: tests/integration/compile_pip_requirements_test_from_external_repo
590-
platform: ubuntu2004
599+
platform: ubuntu2204
591600
shell_commands:
592601
# Assert that @compile_pip_requirements//:requirements_test does the right thing.
593602
- "bazel test @compile_pip_requirements//..."
594603
integration_compile_pip_requirements_test_from_external_repo_ubuntu_min_bzlmod:
595604
<<: *minimum_supported_version
596605
name: "compile_pip_requirements_test_from_external_repo: Ubuntu, bzlmod, minimum Bazel"
597606
working_directory: tests/integration/compile_pip_requirements_test_from_external_repo
598-
platform: ubuntu2004
607+
platform: ubuntu2204
599608
bazel: 7.x
600609
shell_commands:
601610
# Assert that @compile_pip_requirements//:requirements_test does the right thing.
602611
- "bazel test @compile_pip_requirements//..."
603612
integration_compile_pip_requirements_test_from_external_repo_ubuntu:
604613
name: "compile_pip_requirements_test_from_external_repo: Ubuntu"
605614
working_directory: tests/integration/compile_pip_requirements_test_from_external_repo
606-
platform: ubuntu2004
615+
platform: ubuntu2204
607616
shell_commands:
608617
# Assert that @compile_pip_requirements//:requirements_test does the right thing.
609618
- "bazel test @compile_pip_requirements//..."

‎.bazelignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ examples/pip_parse/bazel-pip_parse
2525
examples/pip_parse_vendored/bazel-pip_parse_vendored
2626
examples/pip_repository_annotations/bazel-pip_repository_annotations
2727
examples/py_proto_library/bazel-py_proto_library
28+
gazelle/bazel-gazelle
2829
tests/integration/compile_pip_requirements/bazel-compile_pip_requirements
2930
tests/integration/ignore_root_user_error/bazel-ignore_root_user_error
3031
tests/integration/local_toolchains/bazel-local_toolchains

‎.bazelrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
# (Note, we cannot use `common --deleted_packages` because the bazel version command doesn't support it)
55
# To update these lines, execute
66
# `bazel run @rules_bazel_integration_test//tools:update_deleted_packages`
7-
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/entry_points,examples/bzlmod/entry_points/tests,examples/bzlmod/libs/my_lib,examples/bzlmod/other_module,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/patches,examples/bzlmod/py_proto_library,examples/bzlmod/py_proto_library/example.com/another_proto,examples/bzlmod/py_proto_library/example.com/proto,examples/bzlmod/runfiles,examples/bzlmod/tests,examples/bzlmod/tests/other_module,examples/bzlmod/whl_mods,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,examples/py_proto_library/example.com/another_proto,examples/py_proto_library/example.com/proto,gazelle,gazelle/manifest,gazelle/manifest/generate,gazelle/manifest/hasher,gazelle/manifest/test,gazelle/modules_mapping,gazelle/python,gazelle/pythonconfig,gazelle/python/private,tests/integration/compile_pip_requirements,tests/integration/compile_pip_requirements_test_from_external_repo,tests/integration/custom_commands,tests/integration/ignore_root_user_error,tests/integration/ignore_root_user_error/submodule,tests/integration/local_toolchains,tests/integration/pip_parse,tests/integration/pip_parse/empty,tests/integration/py_cc_toolchain_registered
8-
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/entry_points,examples/bzlmod/entry_points/tests,examples/bzlmod/libs/my_lib,examples/bzlmod/other_module,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/patches,examples/bzlmod/py_proto_library,examples/bzlmod/py_proto_library/example.com/another_proto,examples/bzlmod/py_proto_library/example.com/proto,examples/bzlmod/runfiles,examples/bzlmod/tests,examples/bzlmod/tests/other_module,examples/bzlmod/whl_mods,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,examples/py_proto_library/example.com/another_proto,examples/py_proto_library/example.com/proto,gazelle,gazelle/manifest,gazelle/manifest/generate,gazelle/manifest/hasher,gazelle/manifest/test,gazelle/modules_mapping,gazelle/python,gazelle/pythonconfig,gazelle/python/private,tests/integration/compile_pip_requirements,tests/integration/compile_pip_requirements_test_from_external_repo,tests/integration/custom_commands,tests/integration/ignore_root_user_error,tests/integration/ignore_root_user_error/submodule,tests/integration/local_toolchains,tests/integration/pip_parse,tests/integration/pip_parse/empty,tests/integration/py_cc_toolchain_registered
7+
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/entry_points,examples/bzlmod/entry_points/tests,examples/bzlmod/libs/my_lib,examples/bzlmod/other_module,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/patches,examples/bzlmod/py_proto_library,examples/bzlmod/py_proto_library/example.com/another_proto,examples/bzlmod/py_proto_library/example.com/proto,examples/bzlmod/runfiles,examples/bzlmod/tests,examples/bzlmod/tests/other_module,examples/bzlmod/whl_mods,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,examples/py_proto_library/example.com/another_proto,examples/py_proto_library/example.com/proto,gazelle,gazelle/manifest,gazelle/manifest/generate,gazelle/manifest/hasher,gazelle/manifest/test,gazelle/modules_mapping,gazelle/python,gazelle/pythonconfig,gazelle/python/private,rules_python-repro,tests/integration/compile_pip_requirements,tests/integration/compile_pip_requirements_test_from_external_repo,tests/integration/custom_commands,tests/integration/ignore_root_user_error,tests/integration/ignore_root_user_error/submodule,tests/integration/local_toolchains,tests/integration/pip_parse,tests/integration/pip_parse/empty,tests/integration/py_cc_toolchain_registered,tests/modules/another_module,tests/modules/other,tests/modules/other/nspkg_delta,tests/modules/other/nspkg_gamma,tests/modules/other/nspkg_single,tests/modules/other/simple_v1,tests/modules/other/simple_v2,tests/modules/other/with_external_data,tests/whl_with_build_files/testdata,tests/whl_with_build_files/testdata/somepkg,tests/whl_with_build_files/testdata/somepkg-1.0.dist-info,tests/whl_with_build_files/testdata/somepkg/subpkg
8+
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/entry_points,examples/bzlmod/entry_points/tests,examples/bzlmod/libs/my_lib,examples/bzlmod/other_module,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/patches,examples/bzlmod/py_proto_library,examples/bzlmod/py_proto_library/example.com/another_proto,examples/bzlmod/py_proto_library/example.com/proto,examples/bzlmod/runfiles,examples/bzlmod/tests,examples/bzlmod/tests/other_module,examples/bzlmod/whl_mods,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,examples/py_proto_library/example.com/another_proto,examples/py_proto_library/example.com/proto,gazelle,gazelle/manifest,gazelle/manifest/generate,gazelle/manifest/hasher,gazelle/manifest/test,gazelle/modules_mapping,gazelle/python,gazelle/pythonconfig,gazelle/python/private,rules_python-repro,tests/integration/compile_pip_requirements,tests/integration/compile_pip_requirements_test_from_external_repo,tests/integration/custom_commands,tests/integration/ignore_root_user_error,tests/integration/ignore_root_user_error/submodule,tests/integration/local_toolchains,tests/integration/pip_parse,tests/integration/pip_parse/empty,tests/integration/py_cc_toolchain_registered,tests/modules/another_module,tests/modules/other,tests/modules/other/nspkg_delta,tests/modules/other/nspkg_gamma,tests/modules/other/nspkg_single,tests/modules/other/simple_v1,tests/modules/other/simple_v2,tests/modules/other/with_external_data,tests/whl_with_build_files/testdata,tests/whl_with_build_files/testdata/somepkg,tests/whl_with_build_files/testdata/somepkg-1.0.dist-info,tests/whl_with_build_files/testdata/somepkg/subpkg
99

1010
test --test_output=errors
1111

‎.bcr/gazelle/metadata.template.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"homepage": "https://github.com/bazelbuild/rules_python",
2+
"homepage": "https://github.com/bazel-contrib/rules_python",
33
"maintainers": [
44
{
55
"name": "Richard Levasseur",
6-
"email": "rlevasseur@google.com",
6+
"email": "richardlev@gmail.com",
77
"github": "rickeylev"
88
},
99
{
@@ -13,7 +13,8 @@
1313
}
1414
],
1515
"repository": [
16-
"github:bazelbuild/rules_python"
16+
"github:bazelbuild/rules_python",
17+
"github:bazel-contrib/rules_python"
1718
],
1819
"versions": [],
1920
"yanked_versions": {}

‎.bcr/metadata.template.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"homepage": "https://github.com/bazelbuild/rules_python",
2+
"homepage": "https://github.com/bazel-contrib/rules_python",
33
"maintainers": [
44
{
55
"name": "Richard Levasseur",
6-
"email": "rlevasseur@google.com",
6+
"email": "richardlev@gmail.com",
77
"github": "rickeylev"
88
},
99
{

0 commit comments

Comments
 (0)