From 1bde087d38f8c9740ffcbad33d4a7346a82f3b0c Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 8 Feb 2018 03:04:56 -0200 Subject: [PATCH] yq: update to 2.4.1. --- ...eb4f0d7f2f7bfcbae87e1f4202ba52439f1d7.diff | 31 ------------------- srcpkgs/yq/template | 8 ++--- 2 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 srcpkgs/yq/patches/958eb4f0d7f2f7bfcbae87e1f4202ba52439f1d7.diff diff --git a/srcpkgs/yq/patches/958eb4f0d7f2f7bfcbae87e1f4202ba52439f1d7.diff b/srcpkgs/yq/patches/958eb4f0d7f2f7bfcbae87e1f4202ba52439f1d7.diff deleted file mode 100644 index 5860e5f42d7..00000000000 --- a/srcpkgs/yq/patches/958eb4f0d7f2f7bfcbae87e1f4202ba52439f1d7.diff +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/test/test.py b/test/test.py -index 9d06314..04fa59f 100755 ---- test/test.py -+++ test/test.py -@@ -3,12 +3,13 @@ - - from __future__ import absolute_import, division, print_function, unicode_literals - --import os, sys, unittest, tempfile, json, io -+import os, sys, unittest, tempfile, json, io, platform - - sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))) - from yq import main # noqa - - USING_PYTHON2 = True if sys.version_info < (3, 0) else False -+USING_PYPY = True if platform.python_implementation() == "PyPy" else False - - class TestYq(unittest.TestCase): - def run_yq(self, input_data, args, expect_exit_code=os.EX_OK): -@@ -45,7 +46,9 @@ def test_yq_arg_passthrough(self): - self.assertEqual(self.run_yq("{}", ["--arg", "foo", "bar", "--arg", "x", "y", "--indent", "4", "."]), "") - self.assertEqual(self.run_yq("{}", ["--arg", "foo", "bar", "--arg", "x", "y", "-y", "--indent", "4", ".x=$x"]), - "x: y\n") -- self.run_yq("{}", ["--indent", "9", "."], expect_exit_code=2) -+ err = "yq: Error running jq: {}Error: [Errno 32] Broken pipe{}".format("IO" if USING_PYTHON2 else "BrokenPipe", -+ ": ''." if USING_PYPY else ".") -+ self.run_yq("{}", ["--indent", "9", "."], expect_exit_code=err) - - def fd_path(self, fh): - return "/dev/fd/{}".format(fh.fileno()) - diff --git a/srcpkgs/yq/template b/srcpkgs/yq/template index 2cd293d0eb7..884a7d710ee 100644 --- a/srcpkgs/yq/template +++ b/srcpkgs/yq/template @@ -1,19 +1,19 @@ # Template file for 'yq' pkgname=yq -version=2.3.6 +version=2.4.1 revision=1 noarch=yes build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-yaml" -checkdepends="jq" -depends="python3 python3-yaml jq" +checkdepends="jq python3-xmltodict" +depends="python3 python3-yaml python3-xmltodict jq" short_desc="Command-line YAML processor written in Python that wraps around jq" maintainer="maxice8 " license="Apache-2.0" homepage="https://github.com/kislyuk/yq" distfiles="${PYPI_SITE}/y/yq/yq-${version}.tar.gz" -checksum=795f79b39e45c26396db73f14c2ab42ae172be6bed95e19b30483f2d34fc425b +checksum=4833d4055b0f1c1f1a2fd292421b3472da39c7dc2727d7819efd11065a5fd310 do_check() { python3 test/test.py