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

Javier Jardón javier.jardon at codethink.co.uk
Mon Jan 28 15:59:09 GMT 2013


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

Tests fixed as reported by Sam

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   |   3 +-
 morphlib/util.py                                   |  12 +-
 morphlib/yamlparse.py                              | 119 +++++++++++++++++
 morphlib/yamlparse_tests.py                        |  69 ++++++++++
 run-bootstrap-in-chroot                            |   2 +-
 scripts/convert-git-cache                          |   5 +-
 source-stats                                       |   3 +-
 tests.as-root/disk-builds-rootfs-and-kernel.script |   4 +-
 .../rootfs-tarball-builds-rootfs-and-kernel.script |   2 +-
 tests.as-root/setup                                | 144 ++++++++-------------
 tests.as-root/tarball-image-is-sensible.setup      |   4 +-
 tests.as-root/target-disk-too-small.script         |   6 +-
 18 files changed, 315 insertions(+), 130 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