[PATCH 0/5] V3 Allow Morphologies to be written in YAML

Javier Jardón javier.jardon at codethink.co.uk
Thu Jan 24 18:55:18 GMT 2013


Repo: git://git.baserock.org/baserock/baserock/morph
Ref:  jjardon/yaml-v2
Sha1: 7b056e18a0fbc4629b8784795ffa3e8afeda7a00

Ive tested this with a new baserock devel image builded with the
patch to -devel morphology sent in a previous email.
So far seems to work and all the tests passed

Javier Jardón (2):
  Change build tests to use YAML morphologies
  Remove unneded json module imports

Richard Maw (3):
  Move OrderedDict and json loading to morphlib.util
  Parse as YAML if not valid JSON
  Fix tests

 morphlib/__init__.py                             |   3 +-
 morphlib/morph2.py                               |  37 +++---
 morphlib/morph2_tests.py                         |  19 ++-
 morphlib/morphologyfactory.py                    |   6 +-
 morphlib/morphologyfactory_tests.py              |   6 +-
 morphlib/plugins/branch_and_merge_plugin.py      |   1 -
 morphlib/plugins/tarball-systembuilder_plugin.py |   1 -
 morphlib/util.py                                 |  12 +-
 morphlib/yamlparse.py                            | 119 +++++++++++++++++++
 morphlib/yamlparse_tests.py                      |  69 +++++++++++
 run-bootstrap-in-chroot                          |   2 +-
 scripts/convert-git-cache                        |   3 -
 source-stats                                     |   1 -
 tests.as-root/setup                              | 144 +++++++++--------------
 14 files changed, 304 insertions(+), 119 deletions(-)
 create mode 100644 morphlib/yamlparse.py
 create mode 100644 morphlib/yamlparse_tests.py

-- 
1.8.1





More information about the baserock-dev mailing list