Merge ~tshinn/snap-store-proxy-charm:max_line_length_88 into snap-store-proxy-charm:main

Proposed by Tong Shinn
Status: Merged
Approved by: Tong Shinn
Approved revision: 240ec231b7a7d94f42b124d9afee4c5afe4d9816
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~tshinn/snap-store-proxy-charm:max_line_length_88
Merge into: snap-store-proxy-charm:main
Diff against target: 48 lines (+6/-4)
3 files modified
setup.cfg (+1/-1)
src/exceptions.py (+2/-1)
tests/test_charm.py (+3/-2)
Reviewer Review Type Date Requested Status
John Paraskevopoulos Approve
Review via email: mp+436222@code.launchpad.net

Commit message

Set max line length to 88 (Store team convention).

To post a comment you must log in.
Revision history for this message
John Paraskevopoulos (quantifics) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/setup.cfg b/setup.cfg
2index c59d487..dbd2531 100644
3--- a/setup.cfg
4+++ b/setup.cfg
5@@ -1,5 +1,5 @@
6 [flake8]
7-max-line-length = 99
8+max-line-length = 88
9 select: E,W,F,C,N
10 exclude:
11 venv
12diff --git a/src/exceptions.py b/src/exceptions.py
13index 661a7c4..cda33de 100644
14--- a/src/exceptions.py
15+++ b/src/exceptions.py
16@@ -11,7 +11,8 @@ class ConfigException(Exception):
17 class UnknownTypeException(ConfigException):
18 def __init__(self, message):
19 super().__init__(
20- f"Unknown config type defined '{message}', don't know how to validate input."
21+ f"Unknown config type defined '{message}', "
22+ "don't know how to validate input."
23 )
24
25
26diff --git a/tests/test_charm.py b/tests/test_charm.py
27index 43d6364..7c0ccd6 100644
28--- a/tests/test_charm.py
29+++ b/tests/test_charm.py
30@@ -54,7 +54,7 @@ class TestConfig(CharmTest):
31 self.harness.update_config()
32
33 for key, value in self.config_defaults.items():
34- # Accept the default value of None, for items that don't have a default value
35+ # Accept the default value of None for items that don't have a default value
36 assert getattr(self.harness.charm._stored, key, None) == value
37
38 def test_on_config_changed(self):
39@@ -529,7 +529,8 @@ class TestInstallation(CharmTest):
40 assert not hasattr(self.harness.charm._stored, "snap_md5")
41
42 def test_install_from_store_update(self):
43- # In case of an update (repeated call) nothing should happen if installed from store
44+ # In case of an update (repeated call) nothing should happen if installed from
45+ # store
46 self.harness.charm._stored.snap_install_source = "store"
47
48 with patch("charm.install_from_the_charmstore") as patched_install:

Subscribers

People subscribed via source and target branches

to all changes: