Merge ~aieri/charm-alertsync:devel into charm-alertsync:master

Proposed by Andrea Ieri
Status: Merged
Approved by: Peter Sabaini
Approved revision: 1cb90fcc62585d997f1ca22c620c133e4f640218
Merged at revision: 1cb90fcc62585d997f1ca22c620c133e4f640218
Proposed branch: ~aieri/charm-alertsync:devel
Merge into: charm-alertsync:master
Diff against target: 63 lines (+3/-10)
4 files modified
mod/operator (+1/-0)
src/charm.py (+0/-2)
tests/unit/operator_fixtures.py (+2/-7)
tests/unit/test_charm.py (+0/-1)
Reviewer Review Type Date Requested Status
Peter Sabaini (community) Approve
Paul Goins Approve
Review via email: mp+395615@code.launchpad.net

Commit message

Make the linter happy

Added operator framework submodule

To post a comment you must log in.
Revision history for this message
Paul Goins (vultaire) wrote :

LGTM. 1 more +1 for merge.

review: Approve
Revision history for this message
Peter Sabaini (peter-sabaini) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/mod/operator b/mod/operator
0new file mode 1600000new file mode 160000
index 0000000..ee7194f
--- /dev/null
+++ b/mod/operator
@@ -0,0 +1 @@
1Subproject commit ee7194fdf85e5d5865afc2339314f7d02b089996
diff --git a/src/charm.py b/src/charm.py
index 27421a5..254147b 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -7,14 +7,12 @@ import logging
77
8from charmhelpers.core import host8from charmhelpers.core import host
9from charmhelpers.fetch import snap9from charmhelpers.fetch import snap
10
11from ops.charm import CharmBase10from ops.charm import CharmBase
12from ops.framework import StoredState11from ops.framework import StoredState
13from ops.main import main12from ops.main import main
14from ops.model import ActiveStatus, BlockedStatus, MaintenanceStatus, ModelError13from ops.model import ActiveStatus, BlockedStatus, MaintenanceStatus, ModelError
1514
16import setuppath # noqa:F40115import setuppath # noqa:F401
17
18from lib_alertsync import AlertSyncHelper # noqa: I10016from lib_alertsync import AlertSyncHelper # noqa: I100
1917
2018
diff --git a/tests/unit/operator_fixtures.py b/tests/unit/operator_fixtures.py
index e3ecb4b..acd4966 100644
--- a/tests/unit/operator_fixtures.py
+++ b/tests/unit/operator_fixtures.py
@@ -6,20 +6,15 @@
6"""Operator Charm test fixtures."""6"""Operator Charm test fixtures."""
77
8import os8import os
9from pathlib import Path
9import tempfile10import tempfile
10import unittest11import unittest
11from pathlib import Path
1212
13import mock13import mock
14
15import ops
16import ops.main14import ops.main
17from ops.testing import Harness15from ops.testing import Harness
18
19import setuppath # noqa:F401
20
21import yaml16import yaml
2217import setuppath # noqa:F401
23from src.charm import AlertsyncCharm # noqa: I10018from src.charm import AlertsyncCharm # noqa: I100
2419
2520
diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
index c91dbe3..68ff8bc 100644
--- a/tests/unit/test_charm.py
+++ b/tests/unit/test_charm.py
@@ -9,7 +9,6 @@ import mock
9import setuppath # noqa:F4019import setuppath # noqa:F401
1010
11from operator_fixtures import OperatorTestCase # noqa:F40111from operator_fixtures import OperatorTestCase # noqa:F401
12
13import yaml12import yaml
1413
1514

Subscribers

People subscribed via source and target branches