From 7734d604687e86ca3e5b3569fc8dfb65c6a3ef24 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 13 Sep 2023 21:19:28 +0000
Subject: [PATCH 1/2] chore(deps): update dependency bazel_skylib to v1.4.2

---
 MODULE.bazel        | 2 +-
 internal_deps.bzl   | 6 +++---
 py/repositories.bzl | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index b003b379..8c319445 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -9,5 +9,5 @@ module(
 # Lower-bound versions of direct dependencies.
 # When bumping, add a comment explaining what's required from the newer release.
 bazel_dep(name = "aspect_bazel_lib", version = "1.33.0")
-bazel_dep(name = "bazel_skylib", version = "1.4.0")
+bazel_dep(name = "bazel_skylib", version = "1.4.2")
 bazel_dep(name = "rules_python", version = "0.19.0")
diff --git a/internal_deps.bzl b/internal_deps.bzl
index f510e16d..6542c8f9 100644
--- a/internal_deps.bzl
+++ b/internal_deps.bzl
@@ -44,9 +44,9 @@ def rules_py_internal_deps():
     # see https://github.com/bazelbuild/bazel-skylib/issues/250
     http_archive(
         name = "bazel_skylib",
-        sha256 = "3b620033ca48fcd6f5ef2ac85e0f6ec5639605fa2f627968490e52fc91a9932f",
-        strip_prefix = "bazel-skylib-1.3.0",
-        url = "https://github.com/bazelbuild/bazel-skylib/archive/refs/tags/1.3.0.tar.gz",
+        sha256 = "de9d2cedea7103d20c93a5cc7763099728206bd5088342d0009315913a592cc0",
+        strip_prefix = "bazel-skylib-1.4.2",
+        url = "https://github.com/bazelbuild/bazel-skylib/archive/refs/tags/1.4.2.tar.gz",
     )
 
     http_archive(
diff --git a/py/repositories.bzl b/py/repositories.bzl
index fd4abc7b..7c462c74 100644
--- a/py/repositories.bzl
+++ b/py/repositories.bzl
@@ -24,9 +24,9 @@ def rules_py_dependencies():
     # The minimal version of bazel_skylib we require
     http_archive(
         name = "bazel_skylib",
-        sha256 = "3b620033ca48fcd6f5ef2ac85e0f6ec5639605fa2f627968490e52fc91a9932f",
-        strip_prefix = "bazel-skylib-1.3.0",
-        url = "https://github.com/bazelbuild/bazel-skylib/archive/refs/tags/1.3.0.tar.gz",
+        sha256 = "de9d2cedea7103d20c93a5cc7763099728206bd5088342d0009315913a592cc0",
+        strip_prefix = "bazel-skylib-1.4.2",
+        url = "https://github.com/bazelbuild/bazel-skylib/archive/refs/tags/1.4.2.tar.gz",
     )
 
     http_archive(

From afa6501a16d97e6310f62d73db8f2f9e980108fa Mon Sep 17 00:00:00 2001
From: Matt Mackay <mattem@gmail.com>
Date: Wed, 13 Sep 2023 17:28:46 -0400
Subject: [PATCH 2/2] fixup

---
 BUILD.bazel                 | 2 +-
 WORKSPACE                   | 9 +++++++++
 examples/pytest/BUILD.bazel | 1 +
 internal_deps.bzl           | 9 +++++++++
 py/private/BUILD.bazel      | 2 +-
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index 1fc7ef74..5aa3cf82 100644
--- 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
index fc4261e1..b74a0b9e 100644
--- 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
index 5e7c0c36..aea9922d 100644
--- 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
index 6542c8f9..1065b63e 100644
--- 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
index d9a1bd5c..65679e67 100644
--- 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(