v3.0.2

kislyuk · Jul 5, 2022 · 13315d4 · 13315d4
1 parent 34831d4
commit 13315d4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git 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
@@ -1,5 +1,5 @@
 usage: yq [options] <jq filter> [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] <jq filter> [file...]
-	jq [options] --args <jq filter> [strings...]
-	jq [options] --jsonargs <jq filter> [JSON_TEXTS...]
+Usage:	/Users/andrey.kislyuk/.asdf/installs/jq/1.6/bin/jq [options] <jq filter> [file...]
+	/Users/andrey.kislyuk/.asdf/installs/jq/1.6/bin/jq [options] --args <jq filter> [strings...]
+	/Users/andrey.kislyuk/.asdf/installs/jq/1.6/bin/jq [options] --jsonargs <jq filter> [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
@@ -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",