From 400535dee57ad371ba97519ce2a313ff4f35101e Mon Sep 17 00:00:00 2001
From: Michael Dmitry <33381599+michaeldmitry@users.noreply.github.com>
Date: Fri, 13 Sep 2024 13:25:53 +0300
Subject: [PATCH] Fix CI (#57)

* fix lint

* pin scenario
---
 src/charm.py                           | 1 +
 tests/scenario/test_route_interface.py | 3 ++-
 tests/unit/conftest.py                 | 3 ++-
 tests/unit/test_charm.py               | 9 ++-------
 tox.ini                                | 8 +++++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/charm.py b/src/charm.py
index 0e604b7..657ca1b 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -21,6 +21,7 @@
 from ops.charm import CharmBase
 from ops.main import main
 from ops.model import ActiveStatus, BlockedStatus, Relation, Unit
+
 from types_ import TraefikConfig, UnitConfig
 
 logger = logging.getLogger(__name__)
diff --git a/tests/scenario/test_route_interface.py b/tests/scenario/test_route_interface.py
index a4a1aa8..01c96dd 100644
--- a/tests/scenario/test_route_interface.py
+++ b/tests/scenario/test_route_interface.py
@@ -1,8 +1,9 @@
 import pytest
 import yaml
-from charm import TraefikRouteK8SCharm
 from scenario import Context, Relation, State
 
+from charm import TraefikRouteK8SCharm
+
 
 @pytest.fixture
 def ctx():
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
index 77ddf9f..1d3e8bc 100644
--- a/tests/unit/conftest.py
+++ b/tests/unit/conftest.py
@@ -4,10 +4,11 @@
 import json
 
 import pytest as pytest
-from charm import TraefikRouteK8SCharm
 from ops import framework, storage
 from ops.testing import Harness
 
+from charm import TraefikRouteK8SCharm
+
 MODEL_NAME = "model"
 REMOTE_APP_NAME = "remote"  # the app requesting ingress
 REMOTE_UNIT_NAME = f"{REMOTE_APP_NAME}/0"  # the unit requesting ingress
diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
index 0e2f4f0..0b074ef 100644
--- a/tests/unit/test_charm.py
+++ b/tests/unit/test_charm.py
@@ -5,18 +5,13 @@
 
 import pytest
 import yaml
-from charm import TraefikRouteK8SCharm
 from charms.harness_extensions.v0.capture_events import capture
 from charms.traefik_k8s.v1.ingress_per_unit import IngressDataReadyEvent
 from ops.model import ActiveStatus, BlockedStatus
 from ops.testing import Harness
 
-from tests.unit.conftest import (
-    REMOTE_UNIT_NAME,
-    SAMPLE_INGRESS_DATA,
-    mock_config,
-    mock_happy_path,
-)
+from charm import TraefikRouteK8SCharm
+from tests.unit.conftest import REMOTE_UNIT_NAME, SAMPLE_INGRESS_DATA, mock_config, mock_happy_path
 
 EXPECTED_TRAEFIK_CONFIG = {
     "http": {
diff --git a/tox.ini b/tox.ini
index 0a55bb5..6df6480 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,9 +27,11 @@ description = Apply coding style standards to code
 deps =
     black
     ruff
+    isort
 commands =
-    ruff --fix {[vars]all_path}
+    isort {[vars]all_path}
     black {[vars]all_path}
+    ruff check {[vars]all_path} --fix
 
 [testenv:lint]
 description = Check code against coding style standards
@@ -42,7 +44,7 @@ commands =
     codespell {[vars]lib_path}
     codespell . --skip .git --skip .tox --skip build --skip lib --skip venv* \
       --skip .mypy_cache --skip icon.svg
-    ruff {[vars]all_path}
+    ruff check {[vars]all_path}
     black --check --diff {[vars]all_path}
 
 [testenv:static-{charm,lib,unit,integration}]
@@ -78,7 +80,7 @@ description = Run integration tests
 deps =
     pytest
     jsonschema
-    ops-scenario>=5.0
+    ops-scenario>=5.0,<7.0.0
     -r{toxinidir}/requirements.txt
 commands =
     pytest -v --tb native --log-cli-level=INFO -s {[vars]tst_path}scenario {posargs}