fix: reorder imports for ruff 0.6.x (#392)

src/charm.py

@@ -70,6 +70,7 @@
     WaitingStatus,
 )
 from ops.pebble import PathError
+
 from traefik import (
     CA,
     SERVER_CERT_PATH,

src/traefik.py

@@ -18,6 +18,7 @@
 from charms.oathkeeper.v0.forward_auth import ForwardAuthConfig
 from ops import Container
 from ops.pebble import LayerDict, PathError
+
 from utils import is_hostname
 
 logger = logging.getLogger(__name__)

tests/interface/conftest.py

@@ -3,11 +3,12 @@
 from unittest.mock import patch
 
 import pytest
-from charm import TraefikIngressCharm
 from interface_tester import InterfaceTester
 from ops.pebble import Layer
 from scenario.state import Container, ExecOutput, State
 
+from charm import TraefikIngressCharm
+
 
 # Interface tests are centrally hosted at https://github.com/canonical/charm-relation-interfaces.
 # this fixture is used by the test runner of charm-relation-interfaces to test traefik's compliance

tests/scenario/conftest.py

@@ -1,10 +1,11 @@
 from unittest.mock import PropertyMock, patch
 
 import pytest
-from charm import TraefikIngressCharm
 from ops import pebble
 from scenario import Container, Context, ExecOutput, Model, Mount
 
+from charm import TraefikIngressCharm
+
 MOCK_EXTERNAL_HOSTNAME = "testhostname"
 
 

tests/scenario/test_setup.py

@@ -5,8 +5,9 @@
 
 from unittest.mock import PropertyMock, patch
 
-from charm import TraefikIngressCharm
 from scenario import Container, Context, State
+
+from charm import TraefikIngressCharm
 from traefik import Traefik
 
 

tests/scenario/test_tracing_integration.py

@@ -6,6 +6,7 @@
 from charms.tempo_k8s.v1.charm_tracing import charm_tracing_disabled
 from charms.tempo_k8s.v2.tracing import ProtocolType, Receiver, TracingProviderAppData
 from scenario import Relation, State
+
 from traefik import CA_CERT_PATH, DYNAMIC_TRACING_PATH
 
 

tests/scenario/test_workload_version.py

@@ -4,10 +4,11 @@
 import unittest
 from unittest.mock import PropertyMock, patch
 
-from charm import TraefikIngressCharm
 from ops.model import ActiveStatus
 from scenario import Container, Context, State
 
+from charm import TraefikIngressCharm
+
 
 @patch("charm.KubernetesServicePatch")
 @patch("lightkube.core.client.GenericSyncClient")

tests/unit/test_charm.py

@@ -8,12 +8,13 @@
 
 import ops.testing
 import yaml
-from charm import TraefikIngressCharm
 from charms.traefik_k8s.v2.ingress import IngressRequirerAppData, IngressRequirerUnitData
 from ops.charm import ActionEvent
 from ops.model import ActiveStatus, Application, BlockedStatus, Relation, WaitingStatus
 from ops.pebble import PathError
 from ops.testing import Harness
+
+from charm import TraefikIngressCharm
 from traefik import STATIC_CONFIG_PATH
 
 ops.testing.SIMULATE_CAN_CONNECT = True

tests/unit/test_deep_merge.py

@@ -1,4 +1,5 @@
 import pytest
+
 from traefik import StaticConfigMergeConflictError, static_config_deep_merge
 
 

tests/unit/test_route.py

@@ -6,8 +6,9 @@
 import ops
 import pytest
 import yaml
-from charm import TraefikIngressCharm
 from ops.testing import Harness
+
+from charm import TraefikIngressCharm
 from traefik import StaticConfigMergeConflictError, Traefik
 
 MODEL_NAME = "test-model"

tests/unit/test_tls_certificates.py

@@ -5,9 +5,10 @@
 from unittest.mock import patch
 
 import ops.testing
-from charm import TraefikIngressCharm
 from ops.testing import Harness
 
+from charm import TraefikIngressCharm
+
 ops.testing.SIMULATE_CAN_CONNECT = True