From a6dcfa36ae6bab1e81f08f6fedca50eaaa63cfde Mon Sep 17 00:00:00 2001 From: Arda Demir Date: Mon, 16 Aug 2021 11:14:15 +0300 Subject: [PATCH] yq: update to 2.12.2. and cleanup dependencies. --- srcpkgs/yq/patches/fix-test-on-ci.patch | 15 +++++++++++++++ srcpkgs/yq/template | 10 +++++----- 2 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/yq/patches/fix-test-on-ci.patch diff --git a/srcpkgs/yq/patches/fix-test-on-ci.patch b/srcpkgs/yq/patches/fix-test-on-ci.patch new file mode 100644 index 000000000000..3ae4d675426d --- /dev/null +++ b/srcpkgs/yq/patches/fix-test-on-ci.patch @@ -0,0 +1,15 @@ +https://github.com/kislyuk/yq/issues/114 + +diff --git a/test/test.py b/test/test.py +index f25dced..ffa7147 100755 +--- a/test/test.py ++++ b/test/test.py +@@ -77,7 +77,7 @@ class TestYq(unittest.TestCase): + 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}) ++ self.run_yq("{}", [], expect_exit_codes={0}) + self.run_yq("{}", ["."]) + self.run_yq(unusable_non_tty_input, [".", test_doc]) + self.run_yq(unusable_non_tty_input, [".", test_doc, test_doc]) diff --git a/srcpkgs/yq/template b/srcpkgs/yq/template index 2ad24598f3fd..4d959b5d4bee 100644 --- a/srcpkgs/yq/template +++ b/srcpkgs/yq/template @@ -1,18 +1,18 @@ # Template file for 'yq' pkgname=yq -version=2.11.1 -revision=2 +version=2.12.2 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-yaml" -depends="python3-setuptools python3-xmltodict python3-yaml python3-toml python3-argcomplete" -checkdepends="jq python3-xmltodict python3-toml python3-argcomplete" +depends="${makedepends} python3-xmltodict python3-toml python3-argcomplete jq" +checkdepends="${depends}" short_desc="Command-line YAML processor written in Python that wraps around jq" maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/kislyuk/yq" distfiles="${PYPI_SITE}/y/yq/yq-${version}.tar.gz" -checksum=74f64e3784a34d8a18efd8addc83cf5ca3478a0a69517d70fd9158a3809f99e0 +checksum=2f156d0724b61487ac8752ed4eaa702a5737b804d5afa46fa55866951cd106d2 do_check() { python3 test/test.py