Merge ~axino/ntp-charm/+git/ntp-charm:axino into ntp-charm:master

Proposed by Junien F
Status: Merged
Approved by: Benjamin Allot
Approved revision: fd9cdd5f95294f1cf902189798d2dd510a432c30
Merged at revision: 048271d2e1e60f6493807c2e6bbccf127bf6c2c0
Proposed branch: ~axino/ntp-charm/+git/ntp-charm:axino
Merge into: ntp-charm:master
Diff against target: 32 lines (+3/-3)
2 files modified
lib/ntp_source_score.py (+1/-1)
unit_tests/test_ntp_source_score.py (+2/-2)
Reviewer Review Type Date Requested Status
Benjamin Allot Approve
Canonical IS Reviewers Pending
Review via email: mp+388987@code.launchpad.net

Commit message

fix "make lint"

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Benjamin Allot (ballot) wrote :

+1

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 048271d2e1e60f6493807c2e6bbccf127bf6c2c0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/ntp_source_score.py b/lib/ntp_source_score.py
2index de77571..30faddd 100755
3--- a/lib/ntp_source_score.py
4+++ b/lib/ntp_source_score.py
5@@ -27,7 +27,7 @@ rand = random.SystemRandom()
6 MAX_THREADS = 32
7
8
9-def rms(l):
10+def rms(l): # noqa E741
11 """Return the root mean square of the list"""
12 if len(l) > 0:
13 squares = [x ** 2 for x in l]
14diff --git a/unit_tests/test_ntp_source_score.py b/unit_tests/test_ntp_source_score.py
15index f38280a..6852c23 100644
16--- a/unit_tests/test_ntp_source_score.py
17+++ b/unit_tests/test_ntp_source_score.py
18@@ -6,12 +6,12 @@ import sys
19 import unittest
20
21 sys.path.append('lib')
22-from ntp_source_score import (
23+from ntp_source_score import ( # noqa E402
24 get_delay_score,
25 get_source_delays,
26 rms,
27 run_cmd,
28-) # NOQA: E402
29+)
30
31 ntpdate_output = """
32 ...

Subscribers

People subscribed via source and target branches

to all changes: