Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-yq for openSUSE:Factory
checked in at 2023-09-29 21:14:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-yq (Old)
and /work/SRC/openSUSE:Factory/.python-yq.new.28202 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-yq"
Fri Sep 29 21:14:00 2023 rev:15 rq:1114071 version:3.2.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-yq/python-yq.changes 2023-07-27
16:53:21.358677868 +0200
+++ /work/SRC/openSUSE:Factory/.python-yq.new.28202/python-yq.changes
2023-09-29 21:15:25.273747837 +0200
@@ -1,0 +2,8 @@
+Thu Sep 28 11:26:17 UTC 2023 - Dirk Müller <dmuel...@suse.com>
+
+- update to 3.2.3:
+ * test.py: use valid values for jsonargs. Fixes #172
+ * Allow editing toml in place (#171)
+ * Documentation improvements
+
+-------------------------------------------------------------------
Old:
----
yq-3.2.2.tar.gz
New:
----
yq-3.2.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-yq.spec ++++++
--- /var/tmp/diff_new_pack.2HeJQG/_old 2023-09-29 21:15:26.237782620 +0200
+++ /var/tmp/diff_new_pack.2HeJQG/_new 2023-09-29 21:15:26.237782620 +0200
@@ -18,7 +18,7 @@
%{?sle15_python_module_pythons}
Name: python-yq
-Version: 3.2.2
+Version: 3.2.3
Release: 0
Summary: Command-line YAML processor - jq wrapper for YAML documents
License: Apache-2.0
++++++ yq-3.2.2.tar.gz -> yq-3.2.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/Changes.rst new/yq-3.2.3/Changes.rst
--- old/yq-3.2.2/Changes.rst 2023-04-22 23:42:12.000000000 +0200
+++ new/yq-3.2.3/Changes.rst 2023-09-09 23:41:55.000000000 +0200
@@ -1,3 +1,12 @@
+Changes for v3.2.3 (2023-09-09)
+===============================
+
+- test.py: use valid values for jsonargs. Fixes #172
+
+- Allow editing toml in place (#171)
+
+- Documentation improvements
+
Changes for v3.2.2 (2023-04-22)
===============================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/Makefile new/yq-3.2.3/Makefile
--- old/yq-3.2.2/Makefile 2023-04-05 03:34:39.000000000 +0200
+++ new/yq-3.2.3/Makefile 2023-05-07 00:52:15.000000000 +0200
@@ -11,6 +11,7 @@
cd docs; sphinx-quickstart
docs:
+ python -m pip install furo sphinx-copybutton
sphinx-build docs docs/html
install:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/PKG-INFO new/yq-3.2.3/PKG-INFO
--- old/yq-3.2.2/PKG-INFO 2023-04-22 23:42:29.521048000 +0200
+++ new/yq-3.2.3/PKG-INFO 2023-09-09 23:42:15.761231400 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: yq
-Version: 3.2.2
+Version: 3.2.3
Summary: Command-line YAML/XML processor - jq wrapper for YAML/XML documents
Home-page: https://github.com/kislyuk/yq
Author: Andrey Kislyuk
@@ -19,8 +19,17 @@
Classifier: Programming Language :: Python :: 3.11
Classifier: Topic :: Software Development :: Libraries :: Python Modules
Requires-Python: >=3.6
-Provides-Extra: tests
License-File: LICENSE
+Requires-Dist: PyYAML>=5.3.1
+Requires-Dist: xmltodict>=0.11.0
+Requires-Dist: tomlkit>=0.11.6
+Requires-Dist: argcomplete>=1.8.1
+Provides-Extra: tests
+Requires-Dist: coverage; extra == "tests"
+Requires-Dist: wheel; extra == "tests"
+Requires-Dist: build; extra == "tests"
+Requires-Dist: ruff; extra == "tests"
+Requires-Dist: mypy; extra == "tests"
yq: Command-line YAML/XML/TOML processor - jq wrapper for YAML, XML, TOML
documents
===================================================================================
@@ -62,10 +71,11 @@
python -m yq -Y --indentless --in-place '.["current-context"] =
"staging-cluster"' ~/.kube/config
-Use the ``--width``/``-w`` option to pass the line wrap width for string
literals. All other command line arguments are
-forwarded to ``jq``. ``yq`` forwards the exit code ``jq`` produced, unless
there was an error in YAML parsing, in which
-case the exit code is 1. See the `jq manual
<https://stedolan.github.io/jq/manual/>`_ for more details on ``jq``
-features and options.
+Use the ``--width``/``-w`` option to pass the line wrap width for string
literals. Use
+``--explicit-start``/``--explicit-end`` to emit YAML start/end markers even
when processing a single document. All other
+command line arguments are forwarded to ``jq``. ``yq`` forwards the exit code
``jq`` produced, unless there was an error
+in YAML parsing, in which case the exit code is 1. See the `jq manual
<https://stedolan.github.io/jq/manual/>`_ for more
+details on ``jq`` features and options.
Because YAML treats JSON as a dialect of YAML, you can use yq to convert JSON
to YAML: ``yq -y . < in.json > out.yml``.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/README.rst new/yq-3.2.3/README.rst
--- old/yq-3.2.2/README.rst 2023-04-22 23:40:20.000000000 +0200
+++ new/yq-3.2.3/README.rst 2023-09-09 23:39:17.000000000 +0200
@@ -38,10 +38,11 @@
python -m yq -Y --indentless --in-place '.["current-context"] =
"staging-cluster"' ~/.kube/config
-Use the ``--width``/``-w`` option to pass the line wrap width for string
literals. All other command line arguments are
-forwarded to ``jq``. ``yq`` forwards the exit code ``jq`` produced, unless
there was an error in YAML parsing, in which
-case the exit code is 1. See the `jq manual
<https://stedolan.github.io/jq/manual/>`_ for more details on ``jq``
-features and options.
+Use the ``--width``/``-w`` option to pass the line wrap width for string
literals. Use
+``--explicit-start``/``--explicit-end`` to emit YAML start/end markers even
when processing a single document. All other
+command line arguments are forwarded to ``jq``. ``yq`` forwards the exit code
``jq`` produced, unless there was an error
+in YAML parsing, in which case the exit code is 1. See the `jq manual
<https://stedolan.github.io/jq/manual/>`_ for more
+details on ``jq`` features and options.
Because YAML treats JSON as a dialect of YAML, you can use yq to convert JSON
to YAML: ``yq -y . < in.json > out.yml``.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/common.mk new/yq-3.2.3/common.mk
--- old/yq-3.2.2/common.mk 2023-04-05 03:34:39.000000000 +0200
+++ new/yq-3.2.3/common.mk 2023-05-07 00:11:31.000000000 +0200
@@ -30,6 +30,8 @@
if [[ -f Changes.md ]]; then cat $$TAG_MSG <(echo) Changes.md |
sponge Changes.md; git add Changes.md; fi; \
if [[ -f Changes.rst ]]; then cat <(pandoc --from markdown --to rst
$$TAG_MSG) <(echo) Changes.rst | sponge Changes.rst; git add Changes.rst; fi; \
yq --help > docs/cli-doc.txt; git add docs/cli-doc.txt; \
+ xq --help > docs/cli-doc-xq.txt; git add docs/cli-doc-xq.txt; \
+ tomlq --help > docs/cli-doc-tomlq.txt; git add
docs/cli-doc-tomlq.txt; \
git commit -m ${TAG}; \
git tag --sign --annotate --file $$TAG_MSG ${TAG}
git push --follow-tags
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/docs/cli-doc-tomlq.txt
new/yq-3.2.3/docs/cli-doc-tomlq.txt
--- old/yq-3.2.2/docs/cli-doc-tomlq.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/yq-3.2.3/docs/cli-doc-tomlq.txt 2023-09-09 23:41:55.000000000 +0200
@@ -0,0 +1,64 @@
+usage: tomlq [options] <jq filter> [input file...]
+
+tomlq: Command-line TOML processor - jq wrapper for TOML documents
+
+tomlq transcodes TOML documents to JSON and passes them to jq.
+See https://github.com/kislyuk/tomlq for more information.
+
+positional arguments:
+ jq_filter
+ files
+
+options:
+ -h, --help show this help message and exit
+ --toml-output, -t Transcode jq JSON output back into TOML and emit it
+ --in-place, -i Edit files in place (no backup - use caution)
+ --version show program's version number and exit
+
+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...]
+
+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
+standard output.
+
+The simplest filter is ., which copies jq's input to its output
+unmodified (except for formatting, but note that IEEE754 is used
+for number representation internally, with all that that implies).
+
+For more advanced filters see the jq(1) manpage ("man jq")
+and/or https://stedolan.github.io/jq
+
+Example:
+
+ $ echo '{"foo": 0}' | jq .
+ {
+ "foo": 0
+ }
+
+Some of the options include:
+ -c compact instead of pretty-printed output;
+ -n use `null` as the single input value;
+ -e set the exit status code based on the output;
+ -s read (slurp) all inputs into an array; apply filter to it;
+ -r output raw strings, not JSON texts;
+ -R read raw strings, not JSON texts;
+ -C colorize JSON;
+ -M monochrome (don't colorize JSON);
+ -S sort keys of objects on output;
+ --tab use tabs for indentation;
+ --arg a v set variable $a to value <v>;
+ --argjson a v set variable $a to JSON value <v>;
+ --slurpfile a f set variable $a to an array of JSON texts read from <f>;
+ --rawfile a f set variable $a to a string consisting of the contents of
<f>;
+ --args remaining arguments are string arguments, not files;
+ --jsonargs remaining arguments are JSON arguments, not files;
+ -- terminates argument processing;
+
+Named arguments are also available as $ARGS.named[], while
+positional arguments are available as $ARGS.positional[].
+
+See the manpage for more options.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/docs/cli-doc-xq.txt
new/yq-3.2.3/docs/cli-doc-xq.txt
--- old/yq-3.2.2/docs/cli-doc-xq.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/yq-3.2.3/docs/cli-doc-xq.txt 2023-09-09 23:41:55.000000000 +0200
@@ -0,0 +1,70 @@
+usage: xq [options] <jq filter> [input file...]
+ [--version]
+ [jq_filter] [files ...]
+
+xq: Command-line XML processor - jq wrapper for XML documents
+
+xq transcodes XML documents to JSON and passes them to jq.
+See https://github.com/kislyuk/xq for more information.
+
+positional arguments:
+ jq_filter
+ files
+
+options:
+ -h, --help show this help message and exit
+ --xml-output, -x Transcode jq JSON output back into XML and emit it
+ --xml-item-depth 123 Specify depth of items to emit (default 0; use a
positive integer to stream large docs)
+ --xml-dtd Preserve XML Document Type Definition (disables
streaming of multiple docs)
+ --xml-root XML_ROOT When transcoding back to XML, envelope the output in
an element with this name
+ --xml-force-list ELT Emit a list for elements with this name even if they
occur only once (option can repeat)
+ --in-place, -i Edit files in place (no backup - use caution)
+ --version show program's version number and exit
+
+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...]
+
+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
+standard output.
+
+The simplest filter is ., which copies jq's input to its output
+unmodified (except for formatting, but note that IEEE754 is used
+for number representation internally, with all that that implies).
+
+For more advanced filters see the jq(1) manpage ("man jq")
+and/or https://stedolan.github.io/jq
+
+Example:
+
+ $ echo '{"foo": 0}' | jq .
+ {
+ "foo": 0
+ }
+
+Some of the options include:
+ -c compact instead of pretty-printed output;
+ -n use `null` as the single input value;
+ -e set the exit status code based on the output;
+ -s read (slurp) all inputs into an array; apply filter to it;
+ -r output raw strings, not JSON texts;
+ -R read raw strings, not JSON texts;
+ -C colorize JSON;
+ -M monochrome (don't colorize JSON);
+ -S sort keys of objects on output;
+ --tab use tabs for indentation;
+ --arg a v set variable $a to value <v>;
+ --argjson a v set variable $a to JSON value <v>;
+ --slurpfile a f set variable $a to an array of JSON texts read from <f>;
+ --rawfile a f set variable $a to a string consisting of the contents of
<f>;
+ --args remaining arguments are string arguments, not files;
+ --jsonargs remaining arguments are JSON arguments, not files;
+ -- terminates argument processing;
+
+Named arguments are also available as $ARGS.named[], while
+positional arguments are available as $ARGS.positional[].
+
+See the manpage for more options.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/docs/cli-doc.txt
new/yq-3.2.3/docs/cli-doc.txt
--- old/yq-3.2.2/docs/cli-doc.txt 2023-04-22 23:42:12.000000000 +0200
+++ new/yq-3.2.3/docs/cli-doc.txt 2023-09-09 23:41:55.000000000 +0200
@@ -1,5 +1,6 @@
usage: yq [options] <jq filter> [input file...]
- [--indentless-lists] [--in-place] [--version]
+ [--indentless-lists] [--explicit-start] [--explicit-end]
+ [--in-place] [--version]
[jq_filter] [files ...]
yq: Command-line YAML processor - jq wrapper for YAML documents
@@ -11,7 +12,7 @@
jq_filter
files
-optional arguments:
+options:
-h, --help show this help message and exit
--yaml-output, --yml-output, -y
Transcode jq JSON output back into YAML and emit it
@@ -23,6 +24,8 @@
When using --yaml-output, specify string wrap width
--indentless-lists, --indentless
When using --yaml-output, indent block style lists
(sequences) with 0 spaces instead of 2
+ --explicit-start When using --yaml-output, always emit explicit
document start ("---")
+ --explicit-end When using --yaml-output, always emit explicit
document end ("...")
--in-place, -i Edit files in place (no backup - use caution)
--version show program's version number and exit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/docs/conf.py new/yq-3.2.3/docs/conf.py
--- old/yq-3.2.2/docs/conf.py 2022-07-03 21:16:59.000000000 +0200
+++ new/yq-3.2.3/docs/conf.py 2023-05-07 00:52:24.000000000 +0200
@@ -5,29 +5,25 @@
author = "Andrey Kislyuk"
version = ""
release = ""
-language = None
+language = "en"
master_doc = "index"
-extensions = ["sphinx.ext.autodoc", "sphinx.ext.viewcode"]
+extensions = ["sphinx.ext.autodoc", "sphinx.ext.viewcode", "sphinx_copybutton"]
source_suffix = [".rst", ".md"]
exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
pygments_style = "sphinx"
+templates_path = [""]
if "readthedocs.org" in os.getcwd().split("/"):
with open("index.rst", "w") as fh:
fh.write("Documentation for this project has moved to
https://kislyuk.github.io/"; + project)
else:
- import guzzle_sphinx_theme
- html_theme_path = guzzle_sphinx_theme.html_theme_path()
- html_theme = "guzzle_sphinx_theme"
- html_theme_options = {
- "project_nav_name": project,
- "projectlink": "https://github.com/kislyuk/"; + project,
- }
+ html_theme = "furo"
html_sidebars = {
"**": [
- "logo-text.html",
- # "globaltoc.html",
- "localtoc.html",
- "searchbox.html"
+ "sidebar/brand.html",
+ "sidebar/search.html",
+ "sidebar/scroll-start.html",
+ "toc.html",
+ "sidebar/scroll-end.html",
]
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/docs/index.rst new/yq-3.2.3/docs/index.rst
--- old/yq-3.2.2/docs/index.rst 2022-08-21 14:28:41.000000000 +0200
+++ new/yq-3.2.3/docs/index.rst 2023-05-07 01:04:05.000000000 +0200
@@ -3,8 +3,19 @@
CLI usage
=========
+yq
+--
.. literalinclude:: cli-doc.txt
+xq
+--
+.. literalinclude:: cli-doc-xq.txt
+
+tomlq
+-----
+.. literalinclude:: cli-doc-tomlq.txt
+
+
Change log
==========
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/docs/toc.html new/yq-3.2.3/docs/toc.html
--- old/yq-3.2.2/docs/toc.html 1970-01-01 01:00:00.000000000 +0100
+++ new/yq-3.2.3/docs/toc.html 2023-05-07 00:11:31.000000000 +0200
@@ -0,0 +1 @@
+{{toc}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/setup.py new/yq-3.2.3/setup.py
--- old/yq-3.2.2/setup.py 2023-04-22 23:41:39.000000000 +0200
+++ new/yq-3.2.3/setup.py 2023-09-09 23:41:31.000000000 +0200
@@ -4,7 +4,7 @@
setup(
name="yq",
- version="3.2.2",
+ version="3.2.3",
url="https://github.com/kislyuk/yq";,
license="Apache Software License",
author="Andrey Kislyuk",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/test/test.py new/yq-3.2.3/test/test.py
--- old/yq-3.2.2/test/test.py 2023-04-22 23:18:23.000000000 +0200
+++ new/yq-3.2.3/test/test.py 2023-09-09 23:39:51.000000000 +0200
@@ -136,7 +136,7 @@
self.run_yq("{}", ["--indentless", "-y", ".a=$ARGS.positional",
"--args", "a", "b"]), "a:\n- a\n- b\n"
)
self.assertEqual(self.run_yq("{}", ["-y", ".a=$ARGS.positional",
"--args", "a", "b"]), "a:\n - a\n - b\n")
- self.assertEqual(self.run_yq("{}", [".", "--jsonargs", "a", "b"]), "")
+ self.assertEqual(self.run_yq("{}", [".", "--jsonargs", "{}", "{}"]),
"")
def test_short_option_separation(self):
# self.assertEqual(self.run_yq('{"a": 1}', ["-yCcC", "."]), "a: 1\n")
- Fails on 2.7 and 3.8
@@ -185,7 +185,7 @@
with io.open(cfn_filename) as fh:
self.assertEqual(self.run_yq("", ["-Y", ".", cfn_filename]),
fh.read())
- def test_in_place(self):
+ def test_in_place_yaml(self):
with tempfile.NamedTemporaryFile() as tf,
tempfile.NamedTemporaryFile() as tf2:
tf.write(b"- foo\n- bar\n")
tf.seek(0)
@@ -202,6 +202,13 @@
self.assertEqual(tf.read(), b"foo\n...\n")
self.assertEqual(tf2.read(), b"foo\n...\n")
+ def test_in_place_toml(self):
+ with tempfile.NamedTemporaryFile() as tf:
+ tf.write(b'[GLOBAL]\nversion="1.0.0"\n')
+ tf.seek(0)
+ self.run_yq("", ["-i", "-t", '.GLOBAL.version="1.0.1"', tf.name],
input_format="toml")
+ self.assertEqual(tf.read(), b'[GLOBAL]\nversion = "1.0.1"\n')
+
def test_explicit_doc_markers(self):
test_doc = os.path.join(os.path.dirname(__file__), "doc.yml")
self.assertTrue(self.run_yq("", ["-y", ".",
test_doc]).startswith("yaml_struct"))
@@ -210,7 +217,12 @@
def test_xq(self):
self.assertEqual(self.run_yq("<foo/>", ["."], input_format="xml"), "")
+ self.assertEqual(self.run_yq("<foo/>", ["--xml-item-depth=2", "."],
input_format="xml"), "")
+ self.assertEqual(self.run_yq("<foo/>", ["--xml-dtd", "."],
input_format="xml"), "")
self.assertEqual(self.run_yq("<foo/>", ["-x", ".foo.x=1"],
input_format="xml"), "<foo>\n <x>1</x>\n</foo>\n")
+ self.assertTrue(self.run_yq("<foo/>", ["-x", "--xml-dtd", "."],
input_format="xml").startswith("<?xml"))
+ self.assertTrue(self.run_yq("<foo/>", ["-x", "--xml-root=R", "."],
input_format="xml").startswith("<R>"))
+ self.assertEqual(self.run_yq("<foo/>", ["--xml-force-list=foo", "."],
input_format="xml"), "")
self.assertEqual(self.run_yq("<a><b/></a>", ["-y", "."],
input_format="xml"), "a:\n b: null\n")
self.assertEqual(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/yq/__init__.py new/yq-3.2.3/yq/__init__.py
--- old/yq-3.2.2/yq/__init__.py 2023-04-22 23:33:06.000000000 +0200
+++ new/yq-3.2.3/yq/__init__.py 2023-09-09 23:39:17.000000000 +0200
@@ -131,8 +131,8 @@
yq_args = dict(input_format=input_format, program_name=program_name,
jq_args=jq_args, **vars(args))
if in_place:
- if args.output_format not in {"yaml", "annotated_yaml"}:
- sys.exit("{}: -i/--in-place can only be used with
-y/-Y".format(program_name))
+ if args.output_format not in {"yaml", "annotated_yaml", "toml"}:
+ sys.exit("{}: -i/--in-place can only be used with
-y/-Y/-t".format(program_name))
input_streams = yq_args.pop("input_streams")
if len(input_streams) == 1 and input_streams[0].name == "<stdin>":
msg = "{}: -i/--in-place can only be used with filename arguments,
not on standard input"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/yq/parser.py new/yq-3.2.3/yq/parser.py
--- old/yq-3.2.2/yq/parser.py 2023-04-22 23:07:10.000000000 +0200
+++ new/yq-3.2.3/yq/parser.py 2023-09-09 23:39:17.000000000 +0200
@@ -38,6 +38,7 @@
def get_parser(program_name, description):
# By default suppress these help strings and only enable them in the
specific programs.
yaml_output_help, yaml_roundtrip_help, width_help, indentless_help,
grammar_help = [argparse.SUPPRESS] * 5
+ explicit_start_help, explicit_end_help = [argparse.SUPPRESS] * 2
xml_output_help, xml_item_depth_help, xml_dtd_help, xml_root_help,
xml_force_list_help = [argparse.SUPPRESS] * 5
toml_output_help = argparse.SUPPRESS
@@ -57,6 +58,8 @@
"to 1.2 in a future version). Setting this to 1.2 will cause
strings like 'on' and 'no' to be "
"emitted unquoted."
)
+ explicit_start_help = 'When using --yaml-output, always emit explicit
document start ("---")'
+ explicit_end_help = 'When using --yaml-output, always emit explicit
document end ("...")'
elif program_name == "xq":
current_language = "XML"
xml_output_help = "Transcode jq JSON output back into XML and emit it"
@@ -99,17 +102,17 @@
)
parser.add_argument("--width", "-w", type=int, help=width_help)
parser.add_argument("--indentless-lists", "--indentless",
action="store_true", help=indentless_help)
- parser.add_argument("--explicit-start", action="store_true",
help=argparse.SUPPRESS)
- parser.add_argument("--explicit-end", action="store_true",
help=argparse.SUPPRESS)
+ parser.add_argument("--explicit-start", action="store_true",
help=explicit_start_help)
+ parser.add_argument("--explicit-end", action="store_true",
help=explicit_end_help)
parser.add_argument("--no-expand-aliases", action="store_false",
dest="expand_aliases", help=argparse.SUPPRESS)
parser.add_argument("--max-expansion-factor", type=int, default=1024,
help=argparse.SUPPRESS)
parser.add_argument(
"--xml-output", "-x", dest="output_format", action="store_const",
const="xml", help=xml_output_help
)
- parser.add_argument("--xml-item-depth", type=int, default=0,
help=xml_item_depth_help)
+ parser.add_argument("--xml-item-depth", type=int, default=0,
help=xml_item_depth_help, metavar="123")
parser.add_argument("--xml-dtd", action="store_true", help=xml_dtd_help)
parser.add_argument("--xml-root", help=xml_root_help)
- parser.add_argument("--xml-force-list", action="append",
help=xml_force_list_help)
+ parser.add_argument("--xml-force-list", action="append",
help=xml_force_list_help, metavar="ELT")
parser.add_argument(
"--toml-output", "-t", dest="output_format", action="store_const",
const="toml", help=toml_output_help
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/yq/version.py new/yq-3.2.3/yq/version.py
--- old/yq-3.2.2/yq/version.py 2023-04-22 23:42:29.000000000 +0200
+++ new/yq-3.2.3/yq/version.py 2023-09-09 23:42:15.000000000 +0200
@@ -1,4 +1,4 @@
# file generated by setuptools_scm
# don't change, don't track in version control
-__version__ = version = '3.2.2'
-__version_tuple__ = version_tuple = (3, 2, 2)
+__version__ = version = '3.2.3'
+__version_tuple__ = version_tuple = (3, 2, 3)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/yq.egg-info/PKG-INFO
new/yq-3.2.3/yq.egg-info/PKG-INFO
--- old/yq-3.2.2/yq.egg-info/PKG-INFO 2023-04-22 23:42:29.000000000 +0200
+++ new/yq-3.2.3/yq.egg-info/PKG-INFO 2023-09-09 23:42:15.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: yq
-Version: 3.2.2
+Version: 3.2.3
Summary: Command-line YAML/XML processor - jq wrapper for YAML/XML documents
Home-page: https://github.com/kislyuk/yq
Author: Andrey Kislyuk
@@ -19,8 +19,17 @@
Classifier: Programming Language :: Python :: 3.11
Classifier: Topic :: Software Development :: Libraries :: Python Modules
Requires-Python: >=3.6
-Provides-Extra: tests
License-File: LICENSE
+Requires-Dist: PyYAML>=5.3.1
+Requires-Dist: xmltodict>=0.11.0
+Requires-Dist: tomlkit>=0.11.6
+Requires-Dist: argcomplete>=1.8.1
+Provides-Extra: tests
+Requires-Dist: coverage; extra == "tests"
+Requires-Dist: wheel; extra == "tests"
+Requires-Dist: build; extra == "tests"
+Requires-Dist: ruff; extra == "tests"
+Requires-Dist: mypy; extra == "tests"
yq: Command-line YAML/XML/TOML processor - jq wrapper for YAML, XML, TOML
documents
===================================================================================
@@ -62,10 +71,11 @@
python -m yq -Y --indentless --in-place '.["current-context"] =
"staging-cluster"' ~/.kube/config
-Use the ``--width``/``-w`` option to pass the line wrap width for string
literals. All other command line arguments are
-forwarded to ``jq``. ``yq`` forwards the exit code ``jq`` produced, unless
there was an error in YAML parsing, in which
-case the exit code is 1. See the `jq manual
<https://stedolan.github.io/jq/manual/>`_ for more details on ``jq``
-features and options.
+Use the ``--width``/``-w`` option to pass the line wrap width for string
literals. Use
+``--explicit-start``/``--explicit-end`` to emit YAML start/end markers even
when processing a single document. All other
+command line arguments are forwarded to ``jq``. ``yq`` forwards the exit code
``jq`` produced, unless there was an error
+in YAML parsing, in which case the exit code is 1. See the `jq manual
<https://stedolan.github.io/jq/manual/>`_ for more
+details on ``jq`` features and options.
Because YAML treats JSON as a dialect of YAML, you can use yq to convert JSON
to YAML: ``yq -y . < in.json > out.yml``.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-3.2.2/yq.egg-info/SOURCES.txt
new/yq-3.2.3/yq.egg-info/SOURCES.txt
--- old/yq-3.2.2/yq.egg-info/SOURCES.txt 2023-04-22 23:42:29.000000000
+0200
+++ new/yq-3.2.3/yq.egg-info/SOURCES.txt 2023-09-09 23:42:15.000000000
+0200
@@ -11,9 +11,12 @@
.github/FUNDING.yml
.github/workflows/ci.yml
docs/changelog.rst
+docs/cli-doc-tomlq.txt
+docs/cli-doc-xq.txt
docs/cli-doc.txt
docs/conf.py
docs/index.rst
+docs/toc.html
test/cfn.yml
test/doc.yml
test/filter.jq
