Fix import ordering

jumpstarter-dev · Jan 26, 2025 · 9ef8702 · 9ef8702
1 parent 4cee098
commit 9ef8702
Show file tree

Hide file tree

Showing 68 changed files with 80 additions and 141 deletions.
diff --git a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create.py b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create.py
@@ -2,6 +2,7 @@
 from typing import Optional
 
 import asyncclick as click
+from jumpstarter.config import ClientConfigV1Alpha1, ExporterConfigV1Alpha1, UserConfigV1Alpha1
 from jumpstarter_cli_common import (
     AliasedGroup,
     opt_context,
@@ -13,8 +14,6 @@
 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,

diff --git a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create_test.py b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create_test.py
@@ -3,6 +3,11 @@
 
 import pytest
 from asyncclick.testing import CliRunner
+from jumpstarter.config import (
+    ClientConfigV1Alpha1,
+    ClientConfigV1Alpha1Drivers,
+    ExporterConfigV1Alpha1,
+)
 from jumpstarter_kubernetes import (
     ClientsV1Alpha1Api,
     ExportersV1Alpha1Api,
@@ -13,12 +18,6 @@
 )
 from kubernetes_asyncio.client.models import V1ObjectMeta
 
-from jumpstarter.config import (
-    ClientConfigV1Alpha1,
-    ClientConfigV1Alpha1Drivers,
-    ExporterConfigV1Alpha1,
-)
-
 from .create import create
 
 # Generate a random client name

diff --git a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/delete.py b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/delete.py
@@ -2,6 +2,7 @@
 from typing import Optional
 
 import asyncclick as click
+from jumpstarter.config import ClientConfigV1Alpha1, ExporterConfigV1Alpha1, UserConfigV1Alpha1
 from jumpstarter_cli_common import (
     AliasedGroup,
     opt_context,
@@ -13,8 +14,6 @@
 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,

diff --git a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/delete_test.py b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/delete_test.py
@@ -2,21 +2,20 @@
 
 import pytest
 from asyncclick.testing import CliRunner
-from jumpstarter_kubernetes import (
-    ClientsV1Alpha1Api,
-    ExportersV1Alpha1Api,
-    V1Alpha1Exporter,
-    V1Alpha1ExporterStatus,
-)
-from kubernetes_asyncio.client.models import V1ObjectMeta
-
 from jumpstarter.config import (
     ClientConfigV1Alpha1,
     ClientConfigV1Alpha1Drivers,
     ExporterConfigV1Alpha1,
     UserConfigV1Alpha1,
     UserConfigV1Alpha1Config,
 )
+from jumpstarter_kubernetes import (
+    ClientsV1Alpha1Api,
+    ExportersV1Alpha1Api,
+    V1Alpha1Exporter,
+    V1Alpha1ExporterStatus,
+)
+from kubernetes_asyncio.client.models import V1ObjectMeta
 
 from .delete import delete
 

diff --git a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/import_res.py b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/import_res.py
@@ -1,6 +1,11 @@
 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,
@@ -10,12 +15,6 @@
 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,

diff --git a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/import_res_test.py b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/import_res_test.py
@@ -3,16 +3,15 @@
 
 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
 

diff --git a/packages/jumpstarter-cli-client/jumpstarter_cli_client/__init__.py b/packages/jumpstarter-cli-client/jumpstarter_cli_client/__init__.py
@@ -2,9 +2,8 @@
 from typing import Optional
 
 import asyncclick as click
-from jumpstarter_cli_common import AliasedGroup, opt_log_level, version
-
 from jumpstarter.common.utils import env
+from jumpstarter_cli_common import AliasedGroup, opt_log_level, version
 
 from .client_config import create_client_config, delete_client_config, list_client_configs, use_client_config
 from .client_shell import client_shell

diff --git a/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_config.py b/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_config.py
@@ -1,9 +1,8 @@
 from typing import Optional
 
 import asyncclick as click
-from jumpstarter_cli_common import make_table
-
 from jumpstarter.config import ClientConfigV1Alpha1, ClientConfigV1Alpha1Drivers, UserConfigV1Alpha1
+from jumpstarter_cli_common import make_table
 
 
 @click.command("create-config", short_help="Create a client config.")

diff --git a/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_shell.py b/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_shell.py
@@ -1,5 +1,4 @@
 import asyncclick as click
-
 from jumpstarter.common import MetadataFilter
 from jumpstarter.common.utils import launch_shell
 from jumpstarter.config import (

diff --git a/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_test.py b/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_test.py
@@ -1,6 +1,5 @@
 import pytest
 from asyncclick.testing import CliRunner
-
 from jumpstarter.config import ClientConfigV1Alpha1, UserConfigV1Alpha1
 
 from . import client

diff --git a/packages/jumpstarter-cli-client/jumpstarter_cli_client/lease.py b/packages/jumpstarter-cli-client/jumpstarter_cli_client/lease.py
@@ -1,11 +1,10 @@
 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="")

diff --git a/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter.py b/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter.py
@@ -3,7 +3,6 @@
 from pathlib import Path
 
 import asyncclick as click
-
 from jumpstarter.common.utils import launch_shell
 from jumpstarter.config.exporter import ExporterConfigV1Alpha1
 

diff --git a/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter_config.py b/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter_config.py
@@ -1,7 +1,6 @@
 import asyncclick as click
-from jumpstarter_cli_common import make_table
-
 from jumpstarter.config.exporter import ExporterConfigV1Alpha1
+from jumpstarter_cli_common import make_table
 
 arg_alias = click.argument("alias", default="default")
 

diff --git a/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter_test.py b/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter_test.py
@@ -1,6 +1,5 @@
 import pytest
 from asyncclick.testing import CliRunner
-
 from jumpstarter.config.exporter import ExporterConfigV1Alpha1
 
 from . import exporter

diff --git a/packages/jumpstarter-driver-can/jumpstarter_driver_can/client.py b/packages/jumpstarter-driver-can/jumpstarter_driver_can/client.py
@@ -8,9 +8,8 @@
 import can
 import isotp
 from can.bus import _SelfRemovingCyclicTask
-from pydantic import ConfigDict, validate_call
-
 from jumpstarter.client import DriverClient
+from pydantic import ConfigDict, validate_call
 
 from .common import CanMessage, IsoTpAddress, IsoTpAsymmetricAddress, IsoTpMessage
 

diff --git a/packages/jumpstarter-driver-can/jumpstarter_driver_can/client_test.py b/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_driver_can.common import IsoTpParams
 from jumpstarter_driver_can.driver import Can, IsoTpPython, IsoTpSocket
 

diff --git a/packages/jumpstarter-driver-can/jumpstarter_driver_can/driver.py b/packages/jumpstarter-driver-can/jumpstarter_driver_can/driver.py
@@ -4,11 +4,10 @@
 
 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
 
 

diff --git a/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/client.py b/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/client.py
@@ -1,7 +1,6 @@
 from dataclasses import dataclass
 
 import asyncclick as click
-
 from jumpstarter.client import DriverClient
 
 

diff --git a/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/driver.py b/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/driver.py
@@ -1,6 +1,5 @@
-from pydantic.dataclasses import dataclass
-
 from jumpstarter.driver import Driver
+from pydantic.dataclasses import dataclass
 
 
 class CompositeInterface:

diff --git a/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/driver_test.py b/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/driver_test.py
@@ -1,6 +1,5 @@
-from jumpstarter_driver_power.driver import MockPower
-
 from jumpstarter.common.utils import serve
+from jumpstarter_driver_power.driver import MockPower
 
 from .driver import Composite
 

diff --git a/packages/jumpstarter-driver-dutlink/examples/dutlink.py b/packages/jumpstarter-driver-dutlink/examples/dutlink.py
@@ -3,9 +3,8 @@
 import time
 
 import asyncclick as click
-from jumpstarter_driver_network.adapters import PexpectAdapter
-
 from jumpstarter.common.utils import env
+from jumpstarter_driver_network.adapters import PexpectAdapter
 
 # initialize client from exporter config
 # from jumpstarter.common import MetadataFilter

diff --git a/packages/jumpstarter-driver-dutlink/jumpstarter_driver_dutlink/driver.py b/packages/jumpstarter-driver-dutlink/jumpstarter_driver_dutlink/driver.py
@@ -11,14 +11,13 @@
 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__)
 
 

diff --git a/packages/jumpstarter-driver-dutlink/jumpstarter_driver_dutlink/driver_test.py b/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
 
 

diff --git a/packages/jumpstarter-driver-http/jumpstarter_driver_http/client.py b/packages/jumpstarter-driver-http/jumpstarter_driver_http/client.py
@@ -1,11 +1,10 @@
 from dataclasses import dataclass
 from pathlib import Path
 
+from jumpstarter.client import DriverClient
 from jumpstarter_driver_opendal.adapter import OpendalAdapter
 from opendal import Operator
 
-from jumpstarter.client import DriverClient
-
 
 @dataclass(kw_only=True)
 class HttpServerClient(DriverClient):

diff --git a/packages/jumpstarter-driver-http/jumpstarter_driver_http/driver.py b/packages/jumpstarter-driver-http/jumpstarter_driver_http/driver.py
@@ -7,7 +7,6 @@
 import anyio
 from aiohttp import web
 from anyio.streams.file import FileWriteStream
-
 from jumpstarter.driver import Driver, export
 
 logger = logging.getLogger(__name__)

diff --git a/packages/jumpstarter-driver-http/jumpstarter_driver_http/driver_test.py b/packages/jumpstarter-driver-http/jumpstarter_driver_http/driver_test.py
@@ -6,7 +6,6 @@
 import anyio
 import pytest
 from anyio import create_memory_object_stream
-
 from jumpstarter.common.resources import ClientStreamResource
 
 from .driver import HttpServer

diff --git a/packages/jumpstarter-driver-network/jumpstarter_driver_network/adapters/fabric_test.py b/packages/jumpstarter-driver-network/jumpstarter_driver_network/adapters/fabric_test.py
@@ -2,11 +2,10 @@
 from threading import Thread
 from time import sleep
 
+from jumpstarter.common.utils import serve
 from paramiko import AUTH_SUCCESSFUL, OPEN_SUCCEEDED, ServerInterface, Transport
 from paramiko.rsakey import RSAKey
 
-from jumpstarter.common.utils import serve
-
 from ..driver import TcpNetwork
 from .fabric import FabricAdapter
 

diff --git a/packages/jumpstarter-driver-network/jumpstarter_driver_network/adapters/novnc_test.py b/packages/jumpstarter-driver-network/jumpstarter_driver_network/adapters/novnc_test.py
@@ -2,10 +2,9 @@
 from urllib.parse import parse_qsl, urlparse
 
 from anyio.from_thread import start_blocking_portal
-from websocket import create_connection
-
 from jumpstarter.common import TemporaryTcpListener
 from jumpstarter.common.utils import serve
+from websocket import create_connection
 
 from ..driver import TcpNetwork
 from .novnc import NovncAdapter

diff --git a/packages/jumpstarter-driver-network/jumpstarter_driver_network/driver.py b/packages/jumpstarter-driver-network/jumpstarter_driver_network/driver.py
@@ -10,7 +10,6 @@
     create_memory_object_stream,
 )
 from anyio.streams.stapled import StapledObjectStream
-
 from jumpstarter.driver import Driver, exportstream
 
 logger = logging.getLogger(__name__)

diff --git a/packages/jumpstarter-driver-network/jumpstarter_driver_network/driver_test.py b/packages/jumpstarter-driver-network/jumpstarter_driver_network/driver_test.py
@@ -5,7 +5,6 @@
 
 import pytest
 from anyio.from_thread import start_blocking_portal
-
 from jumpstarter.common import TemporaryTcpListener, TemporaryUnixListener
 from jumpstarter.common.utils import serve
 

diff --git a/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/adapter.py b/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/adapter.py
@@ -4,11 +4,10 @@
 
 from anyio import BrokenResourceError, EndOfStream
 from anyio.abc import ObjectStream
-from opendal import AsyncFile, Operator
-from opendal.exceptions import Error
-
 from jumpstarter.client.adapters import ClientAdapter
 from jumpstarter.common.resources import PresignedRequestResource
+from opendal import AsyncFile, Operator
+from opendal.exceptions import Error
 
 
 @dataclass(frozen=True, kw_only=True, slots=True)

diff --git a/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/client.py b/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/client.py
@@ -1,9 +1,8 @@
 from pathlib import Path
 
 import asyncclick as click
-from opendal import Operator
-
 from jumpstarter.client import DriverClient
+from opendal import Operator
 
 from .adapter import OpendalAdapter