Merge lp://staging/~freyes/charms/trusty/memcached/py3-tox into lp://staging/charms/trusty/memcached
Proposed by
Felipe Reyes
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 74 | ||||
| Proposed branch: | lp://staging/~freyes/charms/trusty/memcached/py3-tox | ||||
| Merge into: | lp://staging/charms/trusty/memcached | ||||
| Diff against target: |
4386 lines (+2276/-937) 45 files modified
.bzrignore (+1/-0) .coveragerc (+6/-0) charm-helpers.yaml (+1/-0) hooks/charmhelpers/__init__.py (+11/-13) hooks/charmhelpers/contrib/__init__.py (+11/-13) hooks/charmhelpers/contrib/hahelpers/__init__.py (+11/-13) hooks/charmhelpers/contrib/hahelpers/apache.py (+30/-17) hooks/charmhelpers/contrib/hahelpers/cluster.py (+70/-23) hooks/charmhelpers/contrib/network/__init__.py (+11/-13) hooks/charmhelpers/contrib/network/ip.py (+90/-43) hooks/charmhelpers/contrib/network/ovs/__init__.py (+17/-15) hooks/charmhelpers/contrib/network/ufw.py (+16/-19) hooks/charmhelpers/core/__init__.py (+11/-13) hooks/charmhelpers/core/decorators.py (+11/-13) hooks/charmhelpers/core/files.py (+43/-0) hooks/charmhelpers/core/fstab.py (+11/-13) hooks/charmhelpers/core/hookenv.py (+247/-27) hooks/charmhelpers/core/host.py (+396/-130) hooks/charmhelpers/core/host_factory/centos.py (+56/-0) hooks/charmhelpers/core/host_factory/ubuntu.py (+56/-0) hooks/charmhelpers/core/hugepage.py (+69/-0) hooks/charmhelpers/core/kernel.py (+72/-0) hooks/charmhelpers/core/kernel_factory/centos.py (+17/-0) hooks/charmhelpers/core/kernel_factory/ubuntu.py (+13/-0) hooks/charmhelpers/core/services/__init__.py (+11/-13) hooks/charmhelpers/core/services/base.py (+11/-13) hooks/charmhelpers/core/services/helpers.py (+41/-18) hooks/charmhelpers/core/strutils.py (+41/-13) hooks/charmhelpers/core/sysctl.py (+11/-13) hooks/charmhelpers/core/templating.py (+40/-24) hooks/charmhelpers/core/unitdata.py (+72/-31) hooks/charmhelpers/fetch/__init__.py (+45/-296) hooks/charmhelpers/fetch/archiveurl.py (+19/-15) hooks/charmhelpers/fetch/bzrurl.py (+48/-50) hooks/charmhelpers/fetch/centos.py (+171/-0) hooks/charmhelpers/fetch/giturl.py (+34/-38) hooks/charmhelpers/fetch/ubuntu.py (+313/-0) hooks/charmhelpers/osplatform.py (+19/-0) hooks/memcached_hooks.py (+1/-1) setup.cfg (+5/-0) test-requirements-py2.txt (+9/-0) test-requirements-py3.txt (+7/-0) tox.ini (+38/-0) unit_tests/test_memcached_hooks.py (+62/-46) unit_tests/test_utils.py (+1/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~freyes/charms/trusty/memcached/py3-tox | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jorge Niedbalski (community) | Approve | ||
| charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
This patch enables the charm to use python3, with this change it's possible to deploy trusty or xenial.
This change was tested with juju 2.0 and juju 1.0
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hello,
I checked all the targets, including lint py27, py34, py35, all seems good.
Thanks for fixing @freyes
LGTM.