Accepting request 891039 from home:susnux:branches:devel:languages:python

Update to 2.12.0

OBS-URL: https://build.opensuse.org/request/show/891039
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-yq?expand=0&rev=15

python-yq.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu May  6 13:08:30 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to 2.12.0
+  * Add TOML support and the tomlq CLI utility to access it
+  * Drop Python 2.7 support
+  * Parse correctly when empty string is passed as jq_filter
+  * Better handling of jq_filter and files arguments
+- Add skip-broken-test.py
+
 -------------------------------------------------------------------
 Tue Jul 21 10:35:58 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
 

python-yq.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-yq
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,16 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define skip_python2 1
 Name:           python-yq
-Version:        2.10.1
+Version:        2.12.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 skip-broken-test.py -- https://github.com/kislyuk/yq/issues/114
+Patch0:         skip-broken-test.py
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -31,7 +34,7 @@ Requires:       jq
 Requires:       python-PyYAML >= 3.11
 Requires:       python-argcomplete >= 1.8.1
 Requires:       python-setuptools
-Requires:       python-toml >= 0.9.4
+Requires:       python-toml >= 0.10.0
 Requires:       python-xmltodict >= 0.11.0
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
@@ -39,7 +42,7 @@ BuildArch:      noarch
 # SECTION test requirements
 BuildRequires:  %{python_module PyYAML >= 3.11}
 BuildRequires:  %{python_module argcomplete >= 1.8.1}
-BuildRequires:  %{python_module toml >= 0.9.4}
+BuildRequires:  %{python_module toml >= 0.10.0}
 BuildRequires:  %{python_module xmltodict >= 0.11.0}
 BuildRequires:  jq
 # /SECTION
@@ -49,7 +52,7 @@ BuildRequires:  jq
 yq: Command-line YAML processor - jq wrapper for YAML documents
 
 %prep
-%setup -q -n yq-%{version}
+%autosetup -p1 -n yq-%{version}
 
 %build
 %python_build
@@ -58,15 +61,18 @@ yq: Command-line YAML processor - jq wrapper for YAML documents
 %python_install
 %python_clone -a %{buildroot}%{_bindir}/yq
 %python_clone -a %{buildroot}%{_bindir}/xq
+%python_clone -a %{buildroot}%{_bindir}/tomlq
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %post
 %python_install_alternative yq
 %python_install_alternative xq
+%python_install_alternative tomlq
 
 %postun
 %python_uninstall_alternative yq
 %python_uninstall_alternative xq
+%python_uninstall_alternative tomlq
 
 %check
 export LANG=en_US.UTF-8
@@ -77,6 +83,7 @@ export LANG=en_US.UTF-8
 %doc README.rst
 %python_alternative %{_bindir}/yq
 %python_alternative %{_bindir}/xq
+%python_alternative %{_bindir}/tomlq
 %{python_sitelib}/*
 
 %changelog

skip-broken-test.py

@@ -0,0 +1,13 @@
+diff -Nur yq-2.12.0/test/test.py yq-new/test/test.py
+--- yq-2.12.0/test/test.py	2021-02-05 21:43:57.000000000 +0100
++++ yq-new/test/test.py	2021-05-06 15:19:23.546204914 +0200
+@@ -77,7 +77,8 @@
+         unusable_tty_input = mock.Mock()
+         unusable_tty_input.isatty = mock.Mock(return_value=True)
+ 
+-        self.run_yq("{}", [], expect_exit_codes={0} if sys.stdin.isatty() else {2})
++        # https://github.com/kislyuk/yq/issues/114
++        # self.run_yq("{}", [], expect_exit_codes={0} if sys.stdin.isatty() else {2})
+         self.run_yq("{}", ["."])
+         self.run_yq(unusable_non_tty_input, [".", test_doc])
+         self.run_yq(unusable_non_tty_input, [".", test_doc, test_doc])

yq-2.10.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f6252a0757d0c2a9e55b4402e176a7e41a99e0e6dd5be4f9d5a4d651eeb4d6c0
-size 20470

yq-2.12.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d2ad403504d306b5258b86c698f9856d7ad58b7bb17a2b875691a6a7b8c4c20
+size 20796