Closed rogpeppe closed 6 years ago
for multi-document YAML files we decided to just put all JSON objects in the in.json, after each other. jq
can process it, and if one wants to load it, it's not too complicated to split it into several JSON inputs.
for multi-document YAML files we decided to just put all JSON objects in the in.json, after each other. jq can process it, and if one wants to load it, it's not too complicated to split it into several JSON inputs.
I just made that change (as a separate commit so it's easier to see).
I like the cleanup in general, but I don't want the in-json moved after the out-yaml. I'd like to keep the old ordering. Can you change that back?
Oh, sorry, the old ordering was inconsistent - I just chose the order that the majority of the tests used (of the 155 tests that included both out-yaml and in-json, 132 put in-json after the out-yaml). Happy to move in-json before out-yaml in all of those too, or is there a reason for the ordering being different in some tests?
The order I'm using now (adjusted to put in-json before out-yaml) is:
Does that seem right?
I've created PR #21 (hopefully uncontroversial) so that the diffs in this PR will better reflect just the semantic JSON changes when that lands.
I've updated the PR to do that (again in a separate commit, so the consequent changes are clear).
I've just rebased this branch based on PR #21, which makes the semantic changes considerably clearer. Look at the second commit to see the actual changes.
So you just generated in-json sections for tests where they were missing, correct?
The point ordering seems good to me.
The FRK4 comment is a TestML comment.
I generated in-json for all tests that I could do it for. You're seeing the changes that resulted (i.e. the tests with existing in-json sections were correct).
OK. I approve this if it passes the matrix and @perlpunk approves.
Some tests don't have in-json on purpose. I have to go over all tests and remove those which shouldn't have one.
@rogpeppe Could you run this again on master? I have merged #21.
Also, tests with local tags like !circle
need to be ignored, and probably !!set
.
@rogpeppe we decided to do development in the devel
branch, so that we can easily commit things, test them and later merge things to master.
Could you run this against devel?
Could you run this against devel?
Done, and also retargeted the PR against devel.
merged, thanks! (I removed two changes and amended the commit)
Fixes issue #17.
I've left 2JQS there even though the YAML appears to be invalid, but there's only a single key in the JSON output.
All the JSON has been passed through jq for consistency, and sections arranged in consistent order. JSON which would be derived from data with null keys or with binary tags has been omitted.