fixup

aspect-build · Sep 13, 2023 · afa6501 · afa6501
1 parent 7734d60
commit afa6501
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -21,7 +21,7 @@ gazelle_python_manifest(
 gazelle_binary(
     name = "gazelle_bin",
     languages = [
-        "@bazel_skylib//gazelle/bzl",
+        "@bazel_skylib_gazelle_plugin//bzl",
         "@rules_python_gazelle_plugin//python",
     ],
 )

diff --git a/WORKSPACE b/WORKSPACE
@@ -47,6 +47,7 @@ load("@pypi//:requirements.bzl", "install_deps")
 
 install_deps()
 
+################################
 # For running our own unit tests
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 
@@ -67,6 +68,14 @@ load("@rules_python//gazelle:deps.bzl", _py_gazelle_deps = "gazelle_deps")
 
 _py_gazelle_deps()
 
+load("@bazel_skylib_gazelle_plugin//:workspace.bzl", "bazel_skylib_gazelle_plugin_workspace")
+
+bazel_skylib_gazelle_plugin_workspace()
+
+load("@bazel_skylib_gazelle_plugin//:setup.bzl", "bazel_skylib_gazelle_plugin_setup")
+
+bazel_skylib_gazelle_plugin_setup(register_go_toolchains = False)
+
 ############################################
 # rules_docker dependencies for containers
 load(

diff --git a/examples/pytest/BUILD.bazel b/examples/pytest/BUILD.bazel
@@ -16,5 +16,6 @@ py_test(
     main = ":__test__.py",
     deps = [
         ":__test__",
+        "@pypi_pytest//:pkg",
     ],
 )
diff --git a/internal_deps.bzl b/internal_deps.bzl
@@ -49,6 +49,15 @@ def rules_py_internal_deps():
         url = "https://github.com/bazelbuild/bazel-skylib/archive/refs/tags/1.4.2.tar.gz",
     )
 
+    http_archive(
+        name = "bazel_skylib_gazelle_plugin",
+        sha256 = "3327005dbc9e49cc39602fb46572525984f7119a9c6ffe5ed69fbe23db7c1560",
+        urls = [
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-gazelle-plugin-1.4.2.tar.gz",
+            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-gazelle-plugin-1.4.2.tar.gz",
+        ],
+    )
+
     http_archive(
         name = "io_bazel_stardoc",
         sha256 = "3fd8fec4ddec3c670bd810904e2e33170bedfe12f90adf943508184be458c8bb",

diff --git a/py/private/BUILD.bazel b/py/private/BUILD.bazel
@@ -51,8 +51,8 @@ bzl_library(
 bzl_library(
     name = "py_pytest_main",
     srcs = ["py_pytest_main.bzl"],
-    deps = ["@rules_python//python:defs"],
     visibility = ["//py:__subpackages__"],
+    deps = ["@rules_python//python:defs"],
 )
 
 bzl_library(