From 13315d455c2682aaf412dfded9f4e104868c3b3b Mon Sep 17 00:00:00 2001 From: Andrey Kislyuk Date: Tue, 5 Jul 2022 11:52:55 -0700 Subject: [PATCH] v3.0.2 --- Changes.rst | 7 +++++++ docs/cli-doc.txt | 8 ++++---- setup.py | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Changes.rst b/Changes.rst index d0795fa..da10684 100644 --- a/Changes.rst +++ b/Changes.rst @@ -1,3 +1,10 @@ +Changes for v3.0.2 (2022-07-05) +=============================== + +- Expand merge keys (https://yaml.org/type/merge.html). This is a YAML + 1.1 specific behavior, but will be accommodated in yq due to its + widespread use and low likelihood of accidental invocation. + Changes for v3.0.1 (2022-07-04) =============================== diff --git a/docs/cli-doc.txt b/docs/cli-doc.txt index f12c30f..a789de6 100644 --- a/docs/cli-doc.txt +++ b/docs/cli-doc.txt @@ -1,5 +1,5 @@ usage: yq [options] [input file...] - [jq_filter] [files ...] + [jq_filter] [files [files ...]] yq: Command-line YAML processor - jq wrapper for YAML documents @@ -25,9 +25,9 @@ optional arguments: jq - commandline JSON processor [version 1.6] -Usage: jq [options] [file...] - jq [options] --args [strings...] - jq [options] --jsonargs [JSON_TEXTS...] +Usage: /Users/andrey.kislyuk/.asdf/installs/jq/1.6/bin/jq [options] [file...] + /Users/andrey.kislyuk/.asdf/installs/jq/1.6/bin/jq [options] --args [strings...] + /Users/andrey.kislyuk/.asdf/installs/jq/1.6/bin/jq [options] --jsonargs [JSON_TEXTS...] jq is a tool for processing JSON inputs, applying the given filter to its JSON text inputs and producing the filter's results as JSON on diff --git a/setup.py b/setup.py index 7fe9d30..2f19f3c 100755 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setup( name="yq", - version="3.0.1", + version="3.0.2", url="https://github.com/kislyuk/yq", license="Apache Software License", author="Andrey Kislyuk",