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
1diff --git a/mod/operator b/mod/operator
2new file mode 160000
3index 0000000..ee7194f
4--- /dev/null
5+++ b/mod/operator
6@@ -0,0 +1 @@
7+Subproject commit ee7194fdf85e5d5865afc2339314f7d02b089996
8diff --git a/src/charm.py b/src/charm.py
9index 27421a5..254147b 100755
10--- a/src/charm.py
11+++ b/src/charm.py
12@@ -7,14 +7,12 @@ import logging
13
14 from charmhelpers.core import host
15 from charmhelpers.fetch import snap
16-
17 from ops.charm import CharmBase
18 from ops.framework import StoredState
19 from ops.main import main
20 from ops.model import ActiveStatus, BlockedStatus, MaintenanceStatus, ModelError
21
22 import setuppath # noqa:F401
23-
24 from lib_alertsync import AlertSyncHelper # noqa: I100
25
26
27diff --git a/tests/unit/operator_fixtures.py b/tests/unit/operator_fixtures.py
28index e3ecb4b..acd4966 100644
29--- a/tests/unit/operator_fixtures.py
30+++ b/tests/unit/operator_fixtures.py
31@@ -6,20 +6,15 @@
32 """Operator Charm test fixtures."""
33
34 import os
35+from pathlib import Path
36 import tempfile
37 import unittest
38-from pathlib import Path
39
40 import mock
41-
42-import ops
43 import ops.main
44 from ops.testing import Harness
45-
46-import setuppath # noqa:F401
47-
48 import yaml
49-
50+import setuppath # noqa:F401
51 from src.charm import AlertsyncCharm # noqa: I100
52
53
54diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
55index c91dbe3..68ff8bc 100644
56--- a/tests/unit/test_charm.py
57+++ b/tests/unit/test_charm.py
58@@ -9,7 +9,6 @@ import mock
59 import setuppath # noqa:F401
60
61 from operator_fixtures import OperatorTestCase # noqa:F401
62-
63 import yaml
64
65

Subscribers

People subscribed via source and target branches