chore: clean pre-commit

Author: dimaqq

.pre-commit-config.yaml

@@ -11,12 +11,15 @@ repos:
       - id: check-symlinks
       - id: check-json
       - id: check-yaml
+        # Overlays are deliberately multi-doc
+        exclude: "^tests/integration/bundle/test-overlays/.*multi.*yaml$"
       - id: check-toml
       - id: mixed-line-ending
       - id: end-of-file-fixer
         exclude: "^juju/client/schemas-juju.*json$"
       - id: trailing-whitespace
       - id: detect-private-key
+        exclude: "^tests/.*$"
   # Run the Ruff linter.
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.7.3

docs/_extensions/automembersummary.py

@@ -58,12 +58,12 @@ def run(self):
             lines.append(row(link))
             lines.append(divider)
             for line in summary:
-                lines.append(row(line))
+                lines.append(row(line))  # noqa: PERF401
             if methods:
                 lines.append(row(""))
                 lines.append(row("Methods:"))
                 lines.append(row(""))
-                for i, method in enumerate(methods):
+                for _, method in enumerate(methods):
                     lines.append(row(method))
         lines.append(divider)
         content = "\n".join(lines)

docs/conf.py

@@ -27,7 +27,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath(".."))
 
-from juju.version import CLIENT_VERSION
+from juju.version import CLIENT_VERSION  # noqa: E402
 
 version = CLIENT_VERSION
 
@@ -66,7 +66,7 @@
 
 # General information about the project.
 project = "juju"
-copyright = "2016, Canonical Ltd."
+copyright = "2016, Canonical Ltd."  # noqa: A001
 author = "Canonical"
 
 # The version info for the project you're documenting, acts as replacement for

examples/add_k8s.py

@@ -22,21 +22,21 @@
 
 
 async def main():
-    kubecfg = os.popen("microk8s.config").read()
+    kubecfg = os.popen("microk8s.config").read()  # noqa: S607,S605
     cfg = yaml.safe_load(kubecfg)
     ctx = {v["name"]: v["context"] for v in cfg["contexts"]}[cfg["current-context"]]
     cluster = {v["name"]: v["cluster"] for v in cfg["clusters"]}[ctx["cluster"]]
     user = {v["name"]: v["user"] for v in cfg["users"]}[ctx["user"]]
 
     ep = cluster["server"]
-    caCert = base64.b64decode(cluster["certificate-authority-data"]).decode("utf-8")
+    ca_cert = base64.b64decode(cluster["certificate-authority-data"]).decode("utf-8")
 
     controller = Controller()
     await controller.connect()
 
     cloud = client.Cloud(
         auth_types=["userpass"],
-        ca_certificates=[caCert],
+        ca_certificates=[ca_cert],
         endpoint=ep,
         host_cloud_region="microk8s/localhost",
         regions=[client.CloudRegion(endpoint=ep, name="localhost")],

examples/add_secrets_backend.py

@@ -59,17 +59,17 @@ async def main():
     print(response["results"])
 
     # List the secrets backend
-    list = await c.list_secret_backends()
+    result = await c.list_secret_backends()
     print("Output from list secret backends")
-    print(list["results"])
+    print(result["results"])
 
     # Remove it
     await c.remove_secret_backends("examplevault")
 
     # # Finally after removing
-    list = await c.list_secret_backends()
+    result = await c.list_secret_backends()
     print("Output from list secret backends after removal")
-    print(list["results"])
+    print(result["results"])
 
     await m.disconnect()
 

examples/formatted_status.py

@@ -31,10 +31,10 @@ async def main():
     )
 
     await jasyncio.sleep(10)
-    tmp = tempfile.NamedTemporaryFile(delete=False)
+    tmp = tempfile.NamedTemporaryFile(delete=False)  # noqa: SIM115
     LOG.info("status dumped to %s", tmp.name)
     with open(tmp.name, "w") as f:
-        for i in range(10):
+        for _ in range(10):
             # Uncomment this line to get the full status
             # using the standard output.
             # await formatted_status(model, target=sys.stdout)

examples/future.py

@@ -35,7 +35,9 @@ async def main():
         "nrpe",
     )
 
-    result, ok = await model.block_until(lambda: model.matches(goal_state), timeout=600)
+    _result, _ok = await model.block_until(
+        lambda: model.matches(goal_state), timeout=600
+    )
 
 
 if __name__ == "__main__":

examples/livemodel.py

@@ -13,7 +13,7 @@
 from juju.model import Model
 
 
-async def on_model_change(delta, old, new, model):
+async def on_model_change(delta, old, new, model):  # noqa: RUF029
     print(delta.entity, delta.type, delta.data)
     print(old)
     print(new)

examples/machine_hostname.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 # Copyright 2023 Canonical Ltd.
 # Licensed under the Apache V2, see LICENCE file for details.
 

examples/model.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # Copyright 2023 Canonical Ltd.
 # Licensed under the Apache V2, see LICENCE file for details.
 
@@ -17,11 +19,11 @@
 async def main():
     model = Model()
 
-    retryCount = 3
-    for i in range(0, retryCount):
+    retries = 3
+    for _ in range(0, retries):
         await model.connect_current()
         try:
-            model.applications["foo"].relations
+            print(model.applications["foo"].relations)
         except JujuEntityNotFoundError as e:
             print(e.entity_name)
         finally: