Merge lp:~stub/charms/trusty/nrpe/py3 into lp:charms/trusty/nrpe

[Stuart Bishop]

Multi-series Xenial and Trusty, switch to Python 3.

Address Bug 1599965 by switching to Python3. Also declares this charm multi-series for xenial and trusty.

This will mean cs:nrpe will actually work on Xenial, and not just accidently when Python2 happened to already be installed by the primary charm

[Francis Ginther (fginther)]

The included integration tests are failing for me due to the python3-jinja2 package not being installed. They work when https://code.launchpad.net/~fginther/charm-helpers/install-python3-jinja2/+merge/300121 is applied.

I have some other tests in-progress.

review: Needs Fixing

[Francis Ginther (fginther)]

Other then the python3-jinja2 issue mentioned above, these changes look good.

[Stuart Bishop (stub)]

I have landed Francis' charm-helpers branch, merged it in here, and republished as cs:~canonical-sysadmins/nrpe for people needing this right now.

[Stuart Bishop (stub)]

I've superseded the previous MP with this one. It hides the noise from the first charm-helpers sync.

[lp:~stub/charms/trusty/nrpe/py3]

48. By Stuart Bishop on 2016-07-15

Merge dependent charm-helpers branch

[Francis Ginther (fginther)]

Looks good and tests pass. Also did some deploy testing with xenial instances with no issues.

review: Approve

[David Britton (dpb)]

review: Approve

[David Britton (dpb)]

review: Approve

[Stuart Bishop (stub)]

https://bugs.launchpad.net/bugs/1603891 for promulgation details

[Liam Young (gnuoy)]

review: Approve

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5009/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4807/

review: Needs Fixing (automated testing)

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2016-07-15 06:04:31 +0000
@@ -0,0 +1,4 @@
+*~
+*.pyc
+__pycache__/
+.venv/

=== modified file 'Makefile'
--- Makefile	2015-04-19 07:52:43 +0000
+++ Makefile	2016-07-15 06:04:31 +0000
@@ -1,9 +1,9 @@
 #!/usr/bin/make
-PYTHON := /usr/bin/env python
+PYTHON := /usr/bin/python3
 export PYTHONPATH := hooks
 
 virtualenv:
-	virtualenv .venv
+	virtualenv -p $(PYTHON) .venv
 	.venv/bin/pip install flake8 nose mock six
 
 lint: virtualenv

=== modified file 'hooks/nrpe_hooks.py'
--- hooks/nrpe_hooks.py	2015-03-23 09:45:10 +0000
+++ hooks/nrpe_hooks.py	2016-07-15 06:04:31 +0000
@@ -1,3 +1,3 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 import services
 services.manage()

=== modified file 'metadata.yaml'
--- metadata.yaml	2015-03-23 09:45:10 +0000
+++ metadata.yaml	2016-07-15 06:04:31 +0000
@@ -26,3 +26,6 @@
   local-monitors:
     interface: local-monitors
     scope: container
+series:
+  - xenial
+  - trusty

=== modified file 'tests/00-setup'
--- tests/00-setup	2015-03-23 09:45:10 +0000
+++ tests/00-setup	2016-07-15 06:04:31 +0000
@@ -2,4 +2,4 @@
 
 sudo add-apt-repository ppa:juju/stable -y
 sudo apt-get update
-sudo apt-get install amulet python3-requests python-configparser -y
+sudo apt-get install amulet python3-requests -y

=== modified file 'tests/10-tests'
--- tests/10-tests	2016-03-11 19:43:06 +0000
+++ tests/10-tests	2016-07-15 06:04:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import amulet
 import unittest

=== modified file 'tests/14-basic-nrpe-external-master'
--- tests/14-basic-nrpe-external-master	2016-02-03 22:04:00 +0000
+++ tests/14-basic-nrpe-external-master	2016-07-15 06:04:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import amulet
 import re