diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 641416f2cb..349708f68e 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -32,10 +32,14 @@ tasks: platform: ubuntu2004 build_targets: ["//gazelle/..."] test_targets: ["//gazelle/..."] - linux: + ubuntu: <<: *reusable_config - name: Default test on Linux + name: Default test on Ubuntu platform: ubuntu2004 + debian: + <<: *reusable_config + name: Default test on Debian + platform: debian11 macos: <<: *reusable_config name: Default test on macOS @@ -53,11 +57,16 @@ tasks: test_flags: - "--test_tag_filters=-integration-test,-acceptance-test" - integration_test_build_file_generation_linux: + integration_test_build_file_generation_ubuntu: <<: *reusable_build_test_all - name: build_file_generation integration tests on Linux + name: build_file_generation integration tests on Ubuntu working_directory: examples/build_file_generation platform: ubuntu2004 + integration_test_build_file_generation_debian: + <<: *reusable_build_test_all + name: build_file_generation integration tests on Debian + working_directory: examples/build_file_generation + platform: debian11 integration_test_build_file_generation_macos: <<: *reusable_build_test_all name: build_file_generation integration tests on macOS @@ -69,11 +78,16 @@ tasks: working_directory: examples/build_file_generation platform: windows - integration_test_bzlmod_linux: + integration_test_bzlmod_ubuntu: <<: *reusable_build_test_all - name: bzlmod integration tests on Linux + name: bzlmod integration tests on Ubuntu working_directory: examples/bzlmod platform: ubuntu2004 + integration_test_bzlmod_debian: + <<: *reusable_build_test_all + name: bzlmod integration tests on Debian + working_directory: examples/bzlmod + platform: debian11 integration_test_bzlmod_macos: <<: *reusable_build_test_all name: bzlmod integration tests on macOS @@ -85,11 +99,16 @@ tasks: working_directory: examples/bzlmod platform: windows - integration_test_multi_python_versions_linux: + integration_test_multi_python_versions_ubuntu: <<: *reusable_build_test_all - name: multi_python_versions integration tests on Linux + name: multi_python_versions integration tests on Ubuntu working_directory: examples/multi_python_versions platform: ubuntu2004 + integration_test_multi_python_versions_debian: + <<: *reusable_build_test_all + name: multi_python_versions integration tests on Debian + working_directory: examples/multi_python_versions + platform: debian11 integration_test_multi_python_versions_macos: <<: *reusable_build_test_all name: multi_python_versions integration tests on macOS @@ -101,11 +120,16 @@ tasks: working_directory: examples/multi_python_versions platform: windows - integration_test_pip_install_linux: + integration_test_pip_install_ubuntu: <<: *reusable_build_test_all - name: pip_install integration tests on Linux + name: pip_install integration tests on Ubuntu working_directory: examples/pip_install platform: ubuntu2004 + integration_test_pip_install_debian: + <<: *reusable_build_test_all + name: pip_install integration tests on Debian + working_directory: examples/pip_install + platform: debian11 integration_test_pip_install_macos: <<: *reusable_build_test_all name: pip_install integration tests on macOS @@ -117,11 +141,16 @@ tasks: working_directory: examples/pip_install platform: windows - integration_test_pip_parse_linux: + integration_test_pip_parse_ubuntu: <<: *reusable_build_test_all - name: pip_parse integration tests on Linux + name: pip_parse integration tests on Ubuntu working_directory: examples/pip_parse platform: ubuntu2004 + integration_test_pip_parse_debian: + <<: *reusable_build_test_all + name: pip_parse integration tests on Debian + working_directory: examples/pip_parse + platform: debian11 integration_test_pip_parse_macos: <<: *reusable_build_test_all name: pip_parse integration tests on macOS @@ -133,11 +162,16 @@ tasks: working_directory: examples/pip_parse platform: windows - integration_test_pip_parse_vendored_linux: + integration_test_pip_parse_vendored_ubuntu: <<: *reusable_build_test_all - name: pip_parse_vendored integration tests on Linux + name: pip_parse_vendored integration tests on Ubuntu working_directory: examples/pip_parse_vendored platform: ubuntu2004 + integration_test_pip_parse_vendored_debian: + <<: *reusable_build_test_all + name: pip_parse_vendored integration tests on Debian + working_directory: examples/pip_parse_vendored + platform: debian11 integration_test_pip_parse_vendored_macos: <<: *reusable_build_test_all name: pip_parse_vendored integration tests on macOS @@ -151,11 +185,16 @@ tasks: # working_directory: examples/pip_parse_vendored # platform: windows - integration_test_pip_repository_annotations_linux: + integration_test_pip_repository_annotations_ubuntu: <<: *reusable_build_test_all - name: pip_repository_annotations integration tests on Linux + name: pip_repository_annotations integration tests on Ubuntu working_directory: examples/pip_repository_annotations platform: ubuntu2004 + integration_test_pip_repository_annotations_debian: + <<: *reusable_build_test_all + name: pip_repository_annotations integration tests on Debian + working_directory: examples/pip_repository_annotations + platform: debian11 integration_test_pip_repository_annotations_macos: <<: *reusable_build_test_all name: pip_repository_annotations integration tests on macOS @@ -167,11 +206,16 @@ tasks: working_directory: examples/pip_repository_annotations platform: windows - integration_test_compile_pip_requirements_linux: + integration_test_compile_pip_requirements_ubuntu: <<: *reusable_build_test_all - name: compile_pip_requirements integration tests on Linux + name: compile_pip_requirements integration tests on Ubuntu working_directory: tests/compile_pip_requirements platform: ubuntu2004 + integration_test_compile_pip_requirements_debian: + <<: *reusable_build_test_all + name: compile_pip_requirements integration tests on Debian + working_directory: tests/compile_pip_requirements + platform: debian11 integration_test_compile_pip_requirements_macos: <<: *reusable_build_test_all name: compile_pip_requirements integration tests on macOS @@ -183,11 +227,16 @@ tasks: working_directory: tests/compile_pip_requirements platform: windows - integration_test_pip_repository_entry_points_linux: + integration_test_pip_repository_entry_points_ubuntu: <<: *reusable_build_test_all - name: pip_repository_entry_points integration tests on Linux + name: pip_repository_entry_points integration tests on Ubuntu working_directory: tests/pip_repository_entry_points platform: ubuntu2004 + integration_test_pip_repository_entry_points_debian: + <<: *reusable_build_test_all + name: pip_repository_entry_points integration tests on Debian + working_directory: tests/pip_repository_entry_points + platform: debian11 integration_test_pip_repository_entry_points_macos: <<: *reusable_build_test_all name: pip_repository_entry_points integration tests on macOS diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml index 2ab3c6dfe1..90e3122aca 100644 --- a/.bcr/presubmit.yml +++ b/.bcr/presubmit.yml @@ -1,7 +1,7 @@ bcr_test_module: module_path: "examples/bzlmod" matrix: - platform: ["debian10", "macos", "ubuntu2004", "windows"] + platform: ["debian11", "macos", "ubuntu2004", "windows"] tasks: run_tests: name: "Run test module" diff --git a/examples/bzlmod/requirements.in b/examples/bzlmod/requirements.in index b9c0a5b49e..069f7caf85 100644 --- a/examples/bzlmod/requirements.in +++ b/examples/bzlmod/requirements.in @@ -1,5 +1,5 @@ requests~=2.25.1 s3cmd~=2.1.0 -yamllint~=1.26.3 +yamllint>=1.28.0 tabulate~=0.9.0 pylint~=2.15.5 diff --git a/examples/bzlmod/requirements_lock.txt b/examples/bzlmod/requirements_lock.txt index 8f22f999b7..7126942665 100644 --- a/examples/bzlmod/requirements_lock.txt +++ b/examples/bzlmod/requirements_lock.txt @@ -208,8 +208,9 @@ wrapt==1.14.1 \ --hash=sha256:ee6acae74a2b91865910eef5e7de37dc6895ad96fa23603d1d27ea69df545015 \ --hash=sha256:ef3f72c9666bba2bab70d2a8b79f2c6d2c1a42a7f7e2b0ec83bb2f9e383950af # via astroid -yamllint==1.26.3 \ - --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e +yamllint==1.28.0 \ + --hash=sha256:89bb5b5ac33b1ade059743cf227de73daa34d5e5a474b06a5e17fc16583b0cf2 \ + --hash=sha256:9e3d8ddd16d0583214c5fdffe806c9344086721f107435f68bad990e5a88826b # via -r ./requirements.in # The following packages are considered to be unsafe in a requirements file: diff --git a/examples/bzlmod/requirements_windows.txt b/examples/bzlmod/requirements_windows.txt index cfd1a8d049..55fa92d544 100644 --- a/examples/bzlmod/requirements_windows.txt +++ b/examples/bzlmod/requirements_windows.txt @@ -212,8 +212,9 @@ wrapt==1.14.1 \ --hash=sha256:ee6acae74a2b91865910eef5e7de37dc6895ad96fa23603d1d27ea69df545015 \ --hash=sha256:ef3f72c9666bba2bab70d2a8b79f2c6d2c1a42a7f7e2b0ec83bb2f9e383950af # via astroid -yamllint==1.26.3 \ - --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e +yamllint==1.28.0 \ + --hash=sha256:89bb5b5ac33b1ade059743cf227de73daa34d5e5a474b06a5e17fc16583b0cf2 \ + --hash=sha256:9e3d8ddd16d0583214c5fdffe806c9344086721f107435f68bad990e5a88826b # via -r ./requirements.in # The following packages are considered to be unsafe in a requirements file: diff --git a/tests/pip_repository_entry_points/pip_repository_entry_points_test.py b/tests/pip_repository_entry_points/pip_repository_entry_points_test.py index 5be3f51ad9..914c5d9549 100644 --- a/tests/pip_repository_entry_points/pip_repository_entry_points_test.py +++ b/tests/pip_repository_entry_points/pip_repository_entry_points_test.py @@ -22,7 +22,7 @@ def test_entry_point_void_return(self): stdout=subprocess.PIPE, stderr=subprocess.PIPE, ) - self.assertEqual(proc.stdout.decode("utf-8").strip(), "yamllint 1.26.3") + self.assertEqual(proc.stdout.decode("utf-8").strip(), "yamllint 1.28.0") # yamllint entry_point is of the form `def run(argv=None):` with self.assertRaises(subprocess.CalledProcessError) as context: diff --git a/tests/pip_repository_entry_points/requirements.in b/tests/pip_repository_entry_points/requirements.in index 220274b9b7..2cc4625577 100644 --- a/tests/pip_repository_entry_points/requirements.in +++ b/tests/pip_repository_entry_points/requirements.in @@ -1,5 +1,5 @@ sphinx==4.3.2 -yamllint==1.26.3 +yamllint>=1.28.0 # Last avialable for ubuntu python3.6 setuptools==59.6.0 diff --git a/tests/pip_repository_entry_points/requirements.txt b/tests/pip_repository_entry_points/requirements.txt index 279aed0e80..5491a4b791 100644 --- a/tests/pip_repository_entry_points/requirements.txt +++ b/tests/pip_repository_entry_points/requirements.txt @@ -202,8 +202,9 @@ urllib3==1.26.7 \ --hash=sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece \ --hash=sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844 # via requests -yamllint==1.26.3 \ - --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e +yamllint==1.28.0 \ + --hash=sha256:89bb5b5ac33b1ade059743cf227de73daa34d5e5a474b06a5e17fc16583b0cf2 \ + --hash=sha256:9e3d8ddd16d0583214c5fdffe806c9344086721f107435f68bad990e5a88826b # via -r ./requirements.in # The following packages are considered to be unsafe in a requirements file: