summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-08-26 09:09:22 (GMT)
committerBaserock Gerrit <gerrit@baserock.org>2015-08-26 13:45:45 (GMT)
commit0c5390d6e5bc44dca7c9e13addc7db03958b60d6 (patch)
tree1f49e54a610d97cb89a906d1b356bdd5ab85673a
parentbc1caef721cbdd95037e330fd4fa1236cac135bd (diff)
downloaddefinitions-0c5390d6e5bc44dca7c9e13addc7db03958b60d6.tar.gz
Update to latest release of ruamel.yaml
This version fixes an assertion failure when running the definitions migrations scripts. Change-Id: If96a5d6bf8376b684d418e621b5d419541fdbe31
-rw-r--r--strata/morph-utils.morph9
1 files changed, 2 insertions, 7 deletions
diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph
index f5e3568..03df275 100644
--- a/strata/morph-utils.morph
+++ b/strata/morph-utils.morph
@@ -45,12 +45,7 @@ chunks:
# This chunk isn't required to use Morph, but is required to do automated
# migrations within the definitions.git repo.
-#
-# Currently we include a forked version that includes some support for
-# preserving blank lines. This is quite useful when operating on .morph files.
-# The patches have been submitted upstream here:
-# https://bitbucket.org/ruamel/yaml/pull-request/3
- name: ruamel.yaml
repo: upstream:python-packages/ruamel.yaml
- ref: 840b3ccdb306c6aa6d874474e621ae5596595ae4
- unpetrify-ref: baserock/sam/blank-line-preservation-1
+ ref: f3de88b82bf5e3902c44f6c30aed065e56626ee6
+ unpetrify-ref: 0.10.5