chore(): Fix conflicts

canonical · Sep 12, 2024 · b10d4a8 · b10d4a8
1 parent 40168c0
commit b10d4a8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/charm.py b/src/charm.py
@@ -11,7 +11,7 @@
 from pydantic import ValidationError
 
 from charm_types import CharmConfig
-from constants import DATABASE_RELATION_NAME, MATRIX_RELATION_NAME
+from constants import DATABASE_RELATION_NAME
 from database_observer import DatabaseObserver
 from irc import IRCBridgeService
 from matrix_observer import MatrixObserver

diff --git a/src/matrix_observer.py b/src/matrix_observer.py
@@ -5,15 +5,14 @@
 
 import typing
 
-from ops.charm import CharmBase
-from ops.framework import Object
-from pydantic import SecretStr
-
 from charms.synapse.v0.matrix_auth import (
  MatrixAuthProviderData,
  MatrixAuthRequirerData,
  MatrixAuthRequires,
 )
+from ops.charm import CharmBase
+from ops.framework import Object
+from pydantic import SecretStr
 
 
 class MatrixObserver(Object):

diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py
@@ -52,14 +52,15 @@ async def test_lifecycle_after_relations(app: ops.model.Application, ops_test: O
  assert ops_test.model
  await ops_test.model.deploy("postgresql")
 
-
  # Deploy any charm that provides the matrix homeserver interface
  await tests.integration.helpers.generate_anycharm_relation(
  app, ops_test, "matrix-homeserver", None
  )
 
  # Add relations
- await ops_test.model.wait_for_idle(apps=["postgresql", "matrix-homeserver"], status="active", timeout=60 * 60)
+ await ops_test.model.wait_for_idle(
+ apps=["postgresql", "matrix-homeserver"], status="active", timeout=60 * 60
+ )
  await ops_test.model.add_relation(app.name, "postgresql")
 
  await ops_test.model.wait_for_idle(