Fix Ruff version mismatch and config issues

Author: kirkbrauer

.github/workflows/ruff.yaml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Run ruff
+      - name: Run Ruff
         uses: astral-sh/ruff-action@v3
         with:
           version-file: "pyproject.toml"

.pre-commit-config.yaml

@@ -1,13 +1,13 @@
 default_stages: [pre-commit]
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.5
+    rev: v0.9.3
     hooks:
     - id: ruff
-      name: Ruff check
+      name: Ruff Check
       description: "Run 'ruff check' for extremely fast Python linting"
       args: [ --fix ]
 
     - id: ruff-format
-      name: Ruff format
+      name: Ruff Format
       description: "Run 'ruff format' for extremely fast Python formatting"

__templates__/driver/pyproject.toml.tmpl

@@ -35,5 +35,4 @@ build-backend = "hatchling.build"
 dev = [
     "pytest-cov>=6.0.0",
     "pytest>=8.3.3",
-    "ruff>=0.7.1",
 ]

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create.py

@@ -2,7 +2,6 @@
 from typing import Optional
 
 import asyncclick as click
-from jumpstarter.config import ClientConfigV1Alpha1, ExporterConfigV1Alpha1, UserConfigV1Alpha1
 from jumpstarter_cli_common import (
     AliasedGroup,
     opt_context,
@@ -14,6 +13,8 @@
 from kubernetes_asyncio.client.exceptions import ApiException
 from kubernetes_asyncio.config.config_exception import ConfigException
 
+from jumpstarter.config import ClientConfigV1Alpha1, ExporterConfigV1Alpha1, UserConfigV1Alpha1
+
 from .k8s import (
     handle_k8s_api_exception,
     handle_k8s_config_exception,

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create_test.py

@@ -3,11 +3,6 @@
 
 import pytest
 from asyncclick.testing import CliRunner
-from jumpstarter.config import (
-    ClientConfigV1Alpha1,
-    ClientConfigV1Alpha1Drivers,
-    ExporterConfigV1Alpha1,
-)
 from jumpstarter_kubernetes import (
     ClientsV1Alpha1Api,
     ExportersV1Alpha1Api,
@@ -18,6 +13,12 @@
 )
 from kubernetes_asyncio.client.models import V1ObjectMeta
 
+from jumpstarter.config import (
+    ClientConfigV1Alpha1,
+    ClientConfigV1Alpha1Drivers,
+    ExporterConfigV1Alpha1,
+)
+
 from .create import create
 
 # Generate a random client name

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/delete.py

@@ -2,7 +2,6 @@
 from typing import Optional
 
 import asyncclick as click
-from jumpstarter.config import ClientConfigV1Alpha1, ExporterConfigV1Alpha1, UserConfigV1Alpha1
 from jumpstarter_cli_common import (
     AliasedGroup,
     opt_context,
@@ -14,6 +13,8 @@
 from kubernetes_asyncio.client.exceptions import ApiException
 from kubernetes_asyncio.config.config_exception import ConfigException
 
+from jumpstarter.config import ClientConfigV1Alpha1, ExporterConfigV1Alpha1, UserConfigV1Alpha1
+
 from .k8s import (
     handle_k8s_api_exception,
     handle_k8s_config_exception,

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/delete_test.py

@@ -2,13 +2,6 @@
 
 import pytest
 from asyncclick.testing import CliRunner
-from jumpstarter.config import (
-    ClientConfigV1Alpha1,
-    ClientConfigV1Alpha1Drivers,
-    ExporterConfigV1Alpha1,
-    UserConfigV1Alpha1,
-    UserConfigV1Alpha1Config,
-)
 from jumpstarter_kubernetes import (
     ClientsV1Alpha1Api,
     ExportersV1Alpha1Api,
@@ -17,6 +10,14 @@
 )
 from kubernetes_asyncio.client.models import V1ObjectMeta
 
+from jumpstarter.config import (
+    ClientConfigV1Alpha1,
+    ClientConfigV1Alpha1Drivers,
+    ExporterConfigV1Alpha1,
+    UserConfigV1Alpha1,
+    UserConfigV1Alpha1Config,
+)
+
 from .delete import delete
 
 # Generate a random client name

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/import_res.py

@@ -1,11 +1,6 @@
 from typing import Optional
 
 import asyncclick as click
-from jumpstarter.config import (
-    ClientConfigV1Alpha1,
-    UserConfigV1Alpha1,
-)
-from jumpstarter.config.exporter import ExporterConfigV1Alpha1
 from jumpstarter_cli_common import (
     opt_context,
     opt_kubeconfig,
@@ -15,6 +10,12 @@
 from kubernetes_asyncio.client.exceptions import ApiException
 from kubernetes_asyncio.config.config_exception import ConfigException
 
+from jumpstarter.config import (
+    ClientConfigV1Alpha1,
+    UserConfigV1Alpha1,
+)
+from jumpstarter.config.exporter import ExporterConfigV1Alpha1
+
 from .k8s import (
     handle_k8s_api_exception,
     handle_k8s_config_exception,

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/import_res_test.py

@@ -3,15 +3,16 @@
 
 import pytest
 from asyncclick.testing import CliRunner
+from jumpstarter_kubernetes import (
+    ClientsV1Alpha1Api,
+    ExportersV1Alpha1Api,
+)
+
 from jumpstarter.config import (
     ClientConfigV1Alpha1,
     ClientConfigV1Alpha1Drivers,
     ExporterConfigV1Alpha1,
 )
-from jumpstarter_kubernetes import (
-    ClientsV1Alpha1Api,
-    ExportersV1Alpha1Api,
-)
 
 from .import_res import import_res
 

packages/jumpstarter-cli-client/jumpstarter_cli_client/__init__.py

@@ -2,9 +2,10 @@
 from typing import Optional
 
 import asyncclick as click
-from jumpstarter.common.utils import env
 from jumpstarter_cli_common import AliasedGroup, opt_log_level, version
 
+from jumpstarter.common.utils import env
+
 from .client_config import create_client_config, delete_client_config, list_client_configs, use_client_config
 from .client_shell import client_shell
 from .lease import lease

packages/jumpstarter-cli-client/jumpstarter_cli_client/client_config.py

@@ -1,9 +1,10 @@
 from typing import Optional
 
 import asyncclick as click
-from jumpstarter.config import ClientConfigV1Alpha1, ClientConfigV1Alpha1Drivers, UserConfigV1Alpha1
 from jumpstarter_cli_common import make_table
 
+from jumpstarter.config import ClientConfigV1Alpha1, ClientConfigV1Alpha1Drivers, UserConfigV1Alpha1
+
 
 @click.command("create-config", short_help="Create a client config.")
 @click.argument("name")

packages/jumpstarter-cli-client/jumpstarter_cli_client/client_shell.py

@@ -1,4 +1,5 @@
 import asyncclick as click
+
 from jumpstarter.common import MetadataFilter
 from jumpstarter.common.utils import launch_shell
 from jumpstarter.config import (

packages/jumpstarter-cli-client/jumpstarter_cli_client/client_test.py

@@ -1,5 +1,6 @@
 import pytest
 from asyncclick.testing import CliRunner
+
 from jumpstarter.config import ClientConfigV1Alpha1, UserConfigV1Alpha1
 
 from . import client

packages/jumpstarter-cli-client/jumpstarter_cli_client/lease.py

@@ -1,10 +1,11 @@
 import asyncclick as click
+from jumpstarter_cli_common import AliasedGroup
+
 from jumpstarter.common import MetadataFilter
 from jumpstarter.config import (
     ClientConfigV1Alpha1,
     UserConfigV1Alpha1,
 )
-from jumpstarter_cli_common import AliasedGroup
 
 
 @click.group(cls=AliasedGroup, short_help="")
@@ -47,31 +48,32 @@ def lease_release(name, lease, all_leases):
             raise ValueError("no lease specified")
         config.release_lease(lease)
 
+
 @lease.command("request")
 @click.option("-l", "--label", "labels", type=(str, str), multiple=True)
 @click.argument("name", type=str, default="")
 def lease_request(name, labels):
     """Request an exporter lease from the jumpstarter controller.
 
-The result of this command will be a lease ID that can be used to
-connect to the remote exporter.
+    The result of this command will be a lease ID that can be used to
+    connect to the remote exporter.
 
-This is useful for multi-step workflows where you want to hold a lease
-for a specific exporter while performing multiple operations, or for
-CI environments where one step will request the lease and other steps
-will perform operations on the leased exporter.
+    This is useful for multi-step workflows where you want to hold a lease
+    for a specific exporter while performing multiple operations, or for
+    CI environments where one step will request the lease and other steps
+    will perform operations on the leased exporter.
 
-Example:
+    Example:
 
-.. code-block:: bash
+    .. code-block:: bash
 
-    $ JMP_LEASE=$(jmp lease request -l label match)
-    $ jmp shell
-    $$ j --help
-    $$ exit
-    $ jmp lease release -l "${JMP_LEASE}"
+        $ JMP_LEASE=$(jmp lease request -l label match)
+        $ jmp shell
+        $$ j --help
+        $$ exit
+        $ jmp lease release -l "${JMP_LEASE}"
 
-"""
+    """
     try:
         if name:
             config = ClientConfigV1Alpha1.load(name)

packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter.py

@@ -3,6 +3,7 @@
 from pathlib import Path
 
 import asyncclick as click
+
 from jumpstarter.common.utils import launch_shell
 from jumpstarter.config.exporter import ExporterConfigV1Alpha1
 

packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter_config.py

@@ -1,7 +1,8 @@
 import asyncclick as click
-from jumpstarter.config.exporter import ExporterConfigV1Alpha1
 from jumpstarter_cli_common import make_table
 
+from jumpstarter.config.exporter import ExporterConfigV1Alpha1
+
 arg_alias = click.argument("alias", default="default")
 
 

packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter_test.py

@@ -1,5 +1,6 @@
 import pytest
 from asyncclick.testing import CliRunner
+
 from jumpstarter.config.exporter import ExporterConfigV1Alpha1
 
 from . import exporter

packages/jumpstarter-driver-can/jumpstarter_driver_can/client.py

@@ -8,9 +8,10 @@
 import can
 import isotp
 from can.bus import _SelfRemovingCyclicTask
-from jumpstarter.client import DriverClient
 from pydantic import ConfigDict, validate_call
 
+from jumpstarter.client import DriverClient
+
 from .common import CanMessage, IsoTpAddress, IsoTpAsymmetricAddress, IsoTpMessage
 
 

packages/jumpstarter-driver-can/jumpstarter_driver_can/client_test.py

@@ -6,8 +6,8 @@
 import can
 import isotp
 import pytest
-from jumpstarter.common.utils import serve
 
+from jumpstarter.common.utils import serve
 from jumpstarter_driver_can.common import IsoTpParams
 from jumpstarter_driver_can.driver import Can, IsoTpPython, IsoTpSocket
 

packages/jumpstarter-driver-can/jumpstarter_driver_can/driver.py

@@ -4,10 +4,11 @@
 
 import can
 import isotp
-from jumpstarter.driver import Driver, export
 from pydantic import ConfigDict, validate_call
 from pydantic.dataclasses import dataclass
 
+from jumpstarter.driver import Driver, export
+
 from .common import CanMessage, IsoTpAddress, IsoTpAsymmetricAddress, IsoTpMessage, IsoTpParams
 
 

packages/jumpstarter-driver-composite/jumpstarter_driver_composite/client.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass
 
 import asyncclick as click
+
 from jumpstarter.client import DriverClient
 
 

packages/jumpstarter-driver-composite/jumpstarter_driver_composite/driver.py

@@ -1,6 +1,7 @@
-from jumpstarter.driver import Driver
 from pydantic.dataclasses import dataclass
 
+from jumpstarter.driver import Driver
+
 
 class CompositeInterface:
     @classmethod

packages/jumpstarter-driver-composite/jumpstarter_driver_composite/driver_test.py

@@ -1,6 +1,7 @@
-from jumpstarter.common.utils import serve
 from jumpstarter_driver_power.driver import MockPower
 
+from jumpstarter.common.utils import serve
+
 from .driver import Composite
 
 

packages/jumpstarter-driver-dutlink/examples/dutlink.py

@@ -3,9 +3,10 @@
 import time
 
 import asyncclick as click
-from jumpstarter.common.utils import env
 from jumpstarter_driver_network.adapters import PexpectAdapter
 
+from jumpstarter.common.utils import env
+
 # initialize client from exporter config
 # from jumpstarter.common import MetadataFilter
 # from jumpstarter.config.client import ClientConfigV1Alpha1

packages/jumpstarter-driver-dutlink/jumpstarter_driver_dutlink/driver.py

@@ -11,13 +11,14 @@
 import usb.util
 from anyio import fail_after, sleep
 from anyio.streams.file import FileReadStream, FileWriteStream
-from jumpstarter.driver import Driver, export
 from jumpstarter_driver_composite.driver import CompositeInterface
 from jumpstarter_driver_opendal.driver import StorageMuxInterface
 from jumpstarter_driver_power.driver import PowerInterface, PowerReading
 from jumpstarter_driver_pyserial.driver import PySerial
 from serial.serialutil import SerialException
 
+from jumpstarter.driver import Driver, export
+
 log = logging.getLogger(__name__)
 
 

packages/jumpstarter-driver-dutlink/jumpstarter_driver_dutlink/driver_test.py

@@ -1,8 +1,8 @@
 import pytest
 import usb
-from jumpstarter.common.utils import serve
 from jumpstarter_driver_network.adapters import PexpectAdapter
 
+from jumpstarter.common.utils import serve
 from jumpstarter_driver_dutlink.driver import Dutlink