From 570fc9393ff53e90a2d1a0ab7d40085053de4cf6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 07:57:59 +0000 Subject: [PATCH 1/2] chore(deps): update dependency rules_python to v0.18.0 --- py/repositories.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/py/repositories.bzl b/py/repositories.bzl index db6b0415..fd4abc7b 100644 --- a/py/repositories.bzl +++ b/py/repositories.bzl @@ -55,7 +55,7 @@ bzl_library( ) EOF """], - sha256 = "48a838a6e1983e4884b26812b2c748a35ad284fd339eb8e2a6f3adf95307fbcd", - strip_prefix = "rules_python-0.16.2", - url = "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.16.2.tar.gz", + sha256 = "36362b4d54fcb17342f9071e4c38d63ce83e2e57d7d5599ebdde4670b9760664", + strip_prefix = "rules_python-0.18.0", + url = "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.18.0.tar.gz", ) From 97f8abf26315642df4499f0d3875e89662e9e6be Mon Sep 17 00:00:00 2001 From: Matt Mackay Date: Mon, 13 Feb 2023 20:05:49 -0500 Subject: [PATCH 2/2] add gazelle repo --- BUILD.bazel | 8 ++++---- gazelle_python.yaml | 2 +- internal_deps.bzl | 7 +++++++ py/tests/external-deps/expected_pathing | 6 +++--- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 9823d324..1fc7ef74 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,8 +1,8 @@ load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary") load("@pypi//:requirements.bzl", "all_whl_requirements") -load("@rules_python//gazelle:def.bzl", "GAZELLE_PYTHON_RUNTIME_DEPS") -load("@rules_python//gazelle/manifest:defs.bzl", "gazelle_python_manifest") -load("@rules_python//gazelle/modules_mapping:def.bzl", "modules_mapping") +load("@rules_python_gazelle_plugin//:def.bzl", "GAZELLE_PYTHON_RUNTIME_DEPS") +load("@rules_python_gazelle_plugin//manifest:defs.bzl", "gazelle_python_manifest") +load("@rules_python_gazelle_plugin//modules_mapping:def.bzl", "modules_mapping") load("@rules_python//python:defs.bzl", "py_runtime", "py_runtime_pair") load("@rules_python//python/pip_install:requirements.bzl", "compile_pip_requirements") @@ -22,7 +22,7 @@ gazelle_binary( name = "gazelle_bin", languages = [ "@bazel_skylib//gazelle/bzl", - "@rules_python//gazelle", + "@rules_python_gazelle_plugin//python", ], ) diff --git a/gazelle_python.yaml b/gazelle_python.yaml index 37b9758d..d149fcc2 100644 --- a/gazelle_python.yaml +++ b/gazelle_python.yaml @@ -948,4 +948,4 @@ manifest: tomli: tomli pip_repository: name: pypi -integrity: 96cfc547ea1fbcaa1475f4d19aa40e3116c802ef2416adc30f3f005e94846d54 +integrity: 344699ff59f4dcbff73cf7e91bbc51efcfe6ab9bf1e3d98a152f7d156640ce33 diff --git a/internal_deps.bzl b/internal_deps.bzl index 962d4375..f510e16d 100644 --- a/internal_deps.bzl +++ b/internal_deps.bzl @@ -74,3 +74,10 @@ def rules_py_internal_deps(): strip_prefix = "rules_docker-8e70c6bcb584a15a8fd061ea489b933c0ff344ca", urls = ["https://github.com/bazelbuild/rules_docker/archive/8e70c6bcb584a15a8fd061ea489b933c0ff344ca.zip"], ) + + http_archive( + name = "rules_python_gazelle_plugin", + sha256 = "36362b4d54fcb17342f9071e4c38d63ce83e2e57d7d5599ebdde4670b9760664", + strip_prefix = "rules_python-0.18.0/gazelle", + url = "https://github.com/bazelbuild/rules_python/releases/download/0.18.0/rules_python-0.18.0.tar.gz", + ) diff --git a/py/tests/external-deps/expected_pathing b/py/tests/external-deps/expected_pathing index e718c56f..117a8454 100644 --- a/py/tests/external-deps/expected_pathing +++ b/py/tests/external-deps/expected_pathing @@ -1,7 +1,7 @@ Python: (pwd)/bazel-out/[exec]/bin/py/tests/external-deps/pathing.runfiles/pathing.venv/bin/python -version: 3.9.15 (main, REDACTED) -[Clang 14.0.3 ] -version info: sys.version_info(major=3, minor=9, micro=15, releaselevel='final', serial=0) +version: 3.9.16 (main, REDACTED) +[Clang 15.0.7 ] +version info: sys.version_info(major=3, minor=9, micro=16, releaselevel='final', serial=0) cwd: (pwd) site-packages folder: ['(pwd)/bazel-out/[exec]/bin/py/tests/external-deps/pathing.runfiles/pathing.venv/lib/python3.9/site-packages']