Juju Charms Collection
bird package

Merge lp:~johnsca/charms/trusty/bird/lint into lp:charms/trusty/bird

  1. Trusty Tahr (14.04)
  2. lint
  3. Merge into trunk
Proposed by Nell Jerram
Status: Merged
Merged at revision: 15
Proposed branch: lp:~johnsca/charms/trusty/bird/lint
Merge into: lp:charms/trusty/bird
Diff against target: 33 lines (+3/-2)
3 files modified
.bzrignore (+1/-0)
unit_tests/test_actions.py (+1/-1)
unit_tests/test_relations.py (+1/-1)
To merge this branch: bzr merge lp:~johnsca/charms/trusty/bird/lint
Reviewer Review Type Date Requested Status
Kevin W Monroe Approve
Konstantinos Tsakalozos (community) Approve
Review via email: mp+287962@code.launchpad.net

Description of the change

Hi Cory,

I was just reviewing status of the BIRD charm that Project Calico uses, and noticed these pending lint fixes, which you may still want to merge into the main BIRD charm. So creating this merge proposal as a reminder for that.

Regards - Neil

To post a comment you must log in.
Revision history for this message
Konstantinos Tsakalozos (kos.tsakalozos) wrote :

These changes LGTM. +1 for merging. Thank you for this work.

review: Approve
Revision history for this message
Kevin W Monroe (kwmonroe) wrote :

Looks good and Merged, bird-2 contains this fix:

https://jujucharms.com/bird/trusty/2

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2015-01-19 16:24:09 +0000
3+++ .bzrignore 2016-03-03 16:11:44 +0000
4@@ -1,2 +1,3 @@
5 *.pyc
6 bin/
7+.venv/
8
9=== modified file 'unit_tests/test_actions.py'
10--- unit_tests/test_actions.py 2014-12-04 20:50:34 +0000
11+++ unit_tests/test_actions.py 2016-03-03 16:11:44 +0000
12@@ -7,7 +7,7 @@
13
14 # allow importing actions from the hooks directory
15 sys.path.append(resource_filename(__name__, '../hooks'))
16-import actions
17+import actions # noqa
18
19
20 class TestActions(unittest.TestCase):
21
22=== modified file 'unit_tests/test_relations.py'
23--- unit_tests/test_relations.py 2015-01-29 16:01:55 +0000
24+++ unit_tests/test_relations.py 2016-03-03 16:11:44 +0000
25@@ -8,7 +8,7 @@
26
27 # allow importing relations from the hooks directory
28 sys.path.append(resource_filename(__name__, '../hooks'))
29-import relations
30+import relations # noqa
31
32
33 class TestRelationHelpers(unittest.TestCase):

Subscribers

People subscribed via source and target branches

to all changes: