From 2e26780dd7a29b9e715cc75ae7c3fbaf225e635b3d5f9d7acea3b28b178dfc17 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 26 Jul 2022 16:02:11 +0000 Subject: [PATCH] =?UTF-8?q?-=20Update=20to=203.1.0:=20=20=20=20=20Use=20co?= =?UTF-8?q?nfigurable=20output=20grammar,=20compatible=20with=20YAML=201.1?= =?UTF-8?q?=20-=20Update=20to=203.0.2:=20=20=20-=20Expand=20merge=20keys?= =?UTF-8?q?=20(https://yaml.org/type/merge.html).=20This=20is=20=20=20=20?= =?UTF-8?q?=20a=20YAML=201.1=20specific=20behavior,=20but=20will=20be=20ac?= =?UTF-8?q?commodated=20in=20yq=20=20=20=20=20due=20to=20its=20widespread?= =?UTF-8?q?=20use=20and=20low=20likelihood=20of=20accidental=20=20=20=20?= =?UTF-8?q?=20invocation.=20-=20Update=20to=203.0.1:=20=20=20-=20yq=20now?= =?UTF-8?q?=20uses=20the=20YAML=201.2=20grammar=20when=20parsing=20and=20r?= =?UTF-8?q?endering=20=20=20=20=20YAML=20documents.=20This=20means=20bare?= =?UTF-8?q?=20literals=20like=20=E2=80=9Con=E2=80=9D,=20=E2=80=9Cno?= =?UTF-8?q?=E2=80=9D,=20=20=20=20=20and=20=E2=80=9C12:34:56=E2=80=9D=20are?= =?UTF-8?q?=20interpreted=20as=20strings.=20(Fix=20interrupted=20=20=20=20?= =?UTF-8?q?=20release)=20-=20Removed=20upstreamed=20e37a7981b505aa0fd60d06?= =?UTF-8?q?2ca81fd7b23715233e.patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-yq?expand=0&rev=18 --- ...7981b505aa0fd60d062ca81fd7b23715233e.patch | 22 ------------------- python-yq.changes | 17 ++++++++++++++ python-yq.spec | 4 +--- yq-2.14.0.tar.gz | 3 --- yq-3.1.0.tar.gz | 3 +++ 5 files changed, 21 insertions(+), 28 deletions(-) delete mode 100644 e37a7981b505aa0fd60d062ca81fd7b23715233e.patch delete mode 100644 yq-2.14.0.tar.gz create mode 100644 yq-3.1.0.tar.gz diff --git a/e37a7981b505aa0fd60d062ca81fd7b23715233e.patch b/e37a7981b505aa0fd60d062ca81fd7b23715233e.patch deleted file mode 100644 index 72503f2..0000000 --- a/e37a7981b505aa0fd60d062ca81fd7b23715233e.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e37a7981b505aa0fd60d062ca81fd7b23715233e Mon Sep 17 00:00:00 2001 -From: Andrey Kislyuk -Date: Thu, 24 Feb 2022 22:54:08 -0800 -Subject: [PATCH] Fix expected error - ---- - test/test.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/test.py b/test/test.py -index 1a7b164..75d67cc 100755 ---- a/test/test.py -+++ b/test/test.py -@@ -75,7 +75,7 @@ def test_yq(self): - self.assertEqual(self.run_yq("- понедельник\n- вторник\n", ["-y", "."]), "- понедельник\n- вторник\n") - - def test_yq_err(self): -- err = ('yq: Error running jq: ScannerError: while scanning for the next token\nfound character that ' -+ err = ('yq: Error running jq: ScannerError: while scanning for the next token\nfound character \'%\' that ' - 'cannot start any token\n in "", line 1, column 3.') - self.run_yq("- %", ["."], expect_exit_codes={err, 2}) - diff --git a/python-yq.changes b/python-yq.changes index 5ea841b..bd13d15 100644 --- a/python-yq.changes +++ b/python-yq.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Jul 26 15:58:36 UTC 2022 - Matej Cepl + +- Update to 3.1.0: + Use configurable output grammar, compatible with YAML 1.1 +- Update to 3.0.2: + - 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. +- Update to 3.0.1: + - yq now uses the YAML 1.2 grammar when parsing and rendering + YAML documents. This means bare literals like “on”, “no”, + and “12:34:56” are interpreted as strings. (Fix interrupted + release) +- Removed upstreamed e37a7981b505aa0fd60d062ca81fd7b23715233e.patch + ------------------------------------------------------------------- Fri Feb 25 00:59:37 UTC 2022 - Ferdinand Thiessen diff --git a/python-yq.spec b/python-yq.spec index 8ce4560..3fa28aa 100644 --- a/python-yq.spec +++ b/python-yq.spec @@ -19,14 +19,12 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-yq -Version: 2.14.0 +Version: 3.1.0 Release: 0 Summary: Command-line YAML processor - jq wrapper for YAML documents License: Apache-2.0 URL: https://github.com/kislyuk/yq Source: https://files.pythonhosted.org/packages/source/y/yq/yq-%{version}.tar.gz -# PATCH-FIX-UPSTREAM -Patch0: https://github.com/kislyuk/yq/commit/e37a7981b505aa0fd60d062ca81fd7b23715233e.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros diff --git a/yq-2.14.0.tar.gz b/yq-2.14.0.tar.gz deleted file mode 100644 index 44cba38..0000000 --- a/yq-2.14.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4bf2b299d1e5c7ebd74cfb25d1f5d9b6401063bac07a2d09a156144c1d644e1 -size 28030 diff --git a/yq-3.1.0.tar.gz b/yq-3.1.0.tar.gz new file mode 100644 index 0000000..1d80c05 --- /dev/null +++ b/yq-3.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30a84aa22486c749ba269256bd586c0bcd370b7e2a71e76c3924ead4867e74f2 +size 29627