Merge lp://staging/~bcsaller/charm-tools/composer into lp://staging/charm-tools/1.6
Proposed by
Benjamin Saller
Status: | Merged |
---|---|
Merged at revision: | 359 |
Proposed branch: | lp://staging/~bcsaller/charm-tools/composer |
Merge into: | lp://staging/charm-tools/1.6 |
Diff against target: |
12668 lines (+11533/-368) 117 files modified
.bzrignore (+3/-1) MANIFEST.in (+1/-0) Makefile (+14/-37) charmtools/compose/__init__.py (+466/-0) charmtools/compose/config.py (+113/-0) charmtools/compose/diff_match_patch.py (+1919/-0) charmtools/compose/fetchers.py (+117/-0) charmtools/compose/inspector.py (+101/-0) charmtools/compose/tactics.py (+449/-0) charmtools/utils.py (+518/-0) doc/source/compose-intro.md (+18/-0) doc/source/composer.md (+123/-0) ez_setup.py (+0/-272) helpers/python/charmhelpers/tests/test_charmhelpers.py (+1/-1) requirements.txt (+18/-13) scripts/packages.sh (+19/-0) scripts/test (+0/-7) setup.cfg (+8/-0) setup.py (+16/-16) tests/interfaces/mysql/interface.yaml (+1/-0) tests/interfaces/mysql/provides.py (+1/-0) tests/interfaces/mysql/requires.py (+1/-0) tests/test_charm_generate.py (+0/-7) tests/test_compose.py (+239/-0) tests/test_config.py (+29/-0) tests/test_juju_test.py (+0/-9) tests/test_utils.py (+43/-0) tests/trusty/a/README.md (+1/-0) tests/trusty/a/a (+1/-0) tests/trusty/b/README.md (+1/-0) tests/trusty/b/composer.yaml (+1/-0) tests/trusty/b/metadata.yaml (+11/-0) tests/trusty/c-reactive/README.md (+1/-0) tests/trusty/c-reactive/composer.yaml (+1/-0) tests/trusty/c-reactive/hooks/reactive/main.py (+6/-0) tests/trusty/c/README.md (+1/-0) tests/trusty/c/composer.yaml (+1/-0) tests/trusty/c/metadata.yaml (+11/-0) tests/trusty/chlayer/hooks/charmhelpers.pypi (+1/-0) tests/trusty/mysql/.bzrignore (+2/-0) tests/trusty/mysql/Makefile (+24/-0) tests/trusty/mysql/README.md (+133/-0) tests/trusty/mysql/charm-helpers.yaml (+9/-0) tests/trusty/mysql/config.yaml (+141/-0) tests/trusty/mysql/copyright (+17/-0) tests/trusty/mysql/hooks/charmhelpers/__init__.py (+38/-0) tests/trusty/mysql/hooks/charmhelpers/contrib/__init__.py (+15/-0) tests/trusty/mysql/hooks/charmhelpers/contrib/charmsupport/nrpe.py (+219/-0) tests/trusty/mysql/hooks/charmhelpers/contrib/charmsupport/volumes.py (+156/-0) tests/trusty/mysql/hooks/charmhelpers/contrib/database/mysql.py (+385/-0) tests/trusty/mysql/hooks/charmhelpers/contrib/network/__init__.py (+15/-0) tests/trusty/mysql/hooks/charmhelpers/contrib/network/ip.py (+450/-0) tests/trusty/mysql/hooks/charmhelpers/contrib/peerstorage/__init__.py (+148/-0) tests/trusty/mysql/hooks/charmhelpers/core/__init__.py (+15/-0) tests/trusty/mysql/hooks/charmhelpers/core/decorators.py (+41/-0) tests/trusty/mysql/hooks/charmhelpers/core/fstab.py (+134/-0) tests/trusty/mysql/hooks/charmhelpers/core/hookenv.py (+568/-0) tests/trusty/mysql/hooks/charmhelpers/core/host.py (+446/-0) tests/trusty/mysql/hooks/charmhelpers/core/services/__init__.py (+18/-0) tests/trusty/mysql/hooks/charmhelpers/core/services/base.py (+329/-0) tests/trusty/mysql/hooks/charmhelpers/core/services/helpers.py (+267/-0) tests/trusty/mysql/hooks/charmhelpers/core/strutils.py (+42/-0) tests/trusty/mysql/hooks/charmhelpers/core/sysctl.py (+56/-0) tests/trusty/mysql/hooks/charmhelpers/core/templating.py (+69/-0) tests/trusty/mysql/hooks/charmhelpers/core/unitdata.py (+477/-0) tests/trusty/mysql/hooks/charmhelpers/fetch/__init__.py (+439/-0) tests/trusty/mysql/hooks/charmhelpers/fetch/archiveurl.py (+161/-0) tests/trusty/mysql/hooks/charmhelpers/fetch/bzrurl.py (+78/-0) tests/trusty/mysql/hooks/charmhelpers/fetch/giturl.py (+71/-0) tests/trusty/mysql/hooks/common.py (+109/-0) tests/trusty/mysql/hooks/config-changed (+414/-0) tests/trusty/mysql/hooks/data-relation.py (+31/-0) tests/trusty/mysql/hooks/db-relation-broken (+21/-0) tests/trusty/mysql/hooks/db-relation-joined (+87/-0) tests/trusty/mysql/hooks/ha_relations.py (+163/-0) tests/trusty/mysql/hooks/install (+49/-0) tests/trusty/mysql/hooks/master-relation-changed (+95/-0) tests/trusty/mysql/hooks/monitors-relation-broken (+8/-0) tests/trusty/mysql/hooks/monitors-relation-departed (+3/-0) tests/trusty/mysql/hooks/monitors-relation-joined (+9/-0) tests/trusty/mysql/hooks/monitors.common.bash (+8/-0) tests/trusty/mysql/hooks/munin-relation-changed (+26/-0) tests/trusty/mysql/hooks/munin-relation-joined (+6/-0) tests/trusty/mysql/hooks/nrpe_relations.py (+91/-0) tests/trusty/mysql/hooks/shared_db_relations.py (+153/-0) tests/trusty/mysql/hooks/slave-relation-broken (+11/-0) tests/trusty/mysql/hooks/slave-relation-changed (+89/-0) tests/trusty/mysql/hooks/slave-relation-joined (+2/-0) tests/trusty/mysql/hooks/start (+5/-0) tests/trusty/mysql/hooks/stop (+3/-0) tests/trusty/mysql/hooks/upgrade-charm (+27/-0) tests/trusty/mysql/icon.svg (+335/-0) tests/trusty/mysql/keys/repo.percona.com (+30/-0) tests/trusty/mysql/metadata.yaml (+43/-0) tests/trusty/mysql/monitors.yaml (+13/-0) tests/trusty/mysql/revision (+1/-0) tests/trusty/mysql/scripts/add_to_cluster (+13/-0) tests/trusty/mysql/scripts/charm_helpers_sync.py (+225/-0) tests/trusty/mysql/scripts/mysql_backup.sh (+30/-0) tests/trusty/mysql/scripts/remove_from_cluster (+4/-0) tests/trusty/mysql/templates/apparmor.j2 (+15/-0) tests/trusty/mysql/templates/mysql_backup.j2 (+12/-0) tests/trusty/mysql/tests/00-setup (+12/-0) tests/trusty/mysql/tests/15-configs (+77/-0) tests/trusty/mysql/unit_tests/test_mysql_common.py (+18/-0) tests/trusty/tester/README.md (+1/-0) tests/trusty/tester/composer.yaml (+8/-0) tests/trusty/tester/generate/custom.py (+17/-0) tests/trusty/tester/hooks/start (+1/-0) tests/trusty/tester/metadata.yaml (+14/-0) tests/trusty/use-layers/README.md (+1/-0) tests/trusty/use-layers/composer.yaml (+1/-0) tests/trusty/use-layers/hooks/reactive/main.py (+6/-0) tests_functional/add/test.sh (+2/-2) tests_functional/create/test.sh (+4/-2) tests_functional/proof/record.sh (+1/-1) tox.ini (+21/-0) |
To merge this branch: | bzr merge lp://staging/~bcsaller/charm-tools/composer |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Van Steenburgh (community) | Approve | ||
Cory Johns (community) | Needs Fixing | ||
Marco Ceppi | Pending | ||
Review via email: mp+266281@code.staging.launchpad.net |
Description of the change
This adds the composer stuff
and ports the probject to use tox
To post a comment you must log in.
Need to add blessings, ruamel.yaml, pathspec, and bundletester to the install_requires in setup.py