Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/yq/files/, app-misc/yq/
Date: Mon, 05 Oct 2020 21:09:19
Message-Id: 1601932150.dcd74dbc5a2d0886301fda2f1bda6bcf2e795f08.chutzpah@gentoo
1 commit: dcd74dbc5a2d0886301fda2f1bda6bcf2e795f08
2 Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
3 AuthorDate: Mon Oct 5 21:09:02 2020 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 5 21:09:10 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd74dbc
7
8 app-misc/yq-1.11.1: Version bump
9
10 Copyright: Sony Interactive Entertainment Inc.
11 Package-Manager: Portage-3.0.8, Repoman-3.0.1
12 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
13
14 app-misc/yq/Manifest | 1 +
15 app-misc/yq/files/yq-2.11.1-tests.patch | 13 +++++++++
16 app-misc/yq/metadata.xml | 4 +++
17 app-misc/yq/yq-2.11.1.ebuild | 48 +++++++++++++++++++++++++++++++++
18 4 files changed, 66 insertions(+)
19
20 diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
21 index 2dff83726c5..c8384baa04a 100644
22 --- a/app-misc/yq/Manifest
23 +++ b/app-misc/yq/Manifest
24 @@ -1 +1,2 @@
25 +DIST yq-2.11.1.tar.gz 20660 BLAKE2B 4b51652958121c16462304d21ebe545cca835b6c189a6d7550c7ea0ffc8b7088a02eb61ee412295d85d502a339ec3ccbc67b8dc12cd45a07246cbafa7d7feaf7 SHA512 a59a0b12ac70724bb1b857618a66b8fa38ecd35f37adce0495e74ef194f4547be8adce345f29644d43c3b32c0e680512bfcb527310e17746965f9c1db2b612c1
26 DIST yq-2.9.2.tar.gz 19177 BLAKE2B 038d813679d3583eb863577f317d834f78f614d6be595c96601a06b40c3af5d9b04234381529012328a45984b183376e0647a6b09b8a87642f8e688e39ec7a7f SHA512 a526407f4f34e9c2a0acccaf38207bbe328468419450efaf30171493123b7715c2e6dd6799679220b07bfa7bc9081ac5f758f833ddf05dfb5e1fe14286baf45c
27
28 diff --git a/app-misc/yq/files/yq-2.11.1-tests.patch b/app-misc/yq/files/yq-2.11.1-tests.patch
29 new file mode 100644
30 index 00000000000..6b6231ad7ee
31 --- /dev/null
32 +++ b/app-misc/yq/files/yq-2.11.1-tests.patch
33 @@ -0,0 +1,13 @@
34 +diff --git a/test/test.py b/test/test.py
35 +index a81f41b..f17f03c 100755
36 +--- a/test/test.py
37 ++++ b/test/test.py
38 +@@ -84,7 +84,7 @@ class TestYq(unittest.TestCase):
39 + unusable_tty_input = mock.Mock()
40 + unusable_tty_input.isatty = mock.Mock(return_value=True)
41 +
42 +- self.run_yq("{}", [], expect_exit_codes={0} if sys.stdin.isatty() else {2})
43 ++ self.run_yq("{}", [], expect_exit_codes={0})
44 + self.run_yq("{}", ["."])
45 + self.run_yq(unusable_non_tty_input, [".", test_doc])
46 + self.run_yq(unusable_non_tty_input, [".", test_doc, test_doc])
47
48 diff --git a/app-misc/yq/metadata.xml b/app-misc/yq/metadata.xml
49 index 37885efab09..65f1771cc5d 100644
50 --- a/app-misc/yq/metadata.xml
51 +++ b/app-misc/yq/metadata.xml
52 @@ -8,4 +8,8 @@
53 <maintainer type="person">
54 <email>zmedico@g.o</email>
55 </maintainer>
56 + <maintainer type="person">
57 + <email>chutzpah@g.o</email>
58 + <name>Patrick McLean</name>
59 + </maintainer>
60 </pkgmetadata>
61
62 diff --git a/app-misc/yq/yq-2.11.1.ebuild b/app-misc/yq/yq-2.11.1.ebuild
63 new file mode 100644
64 index 00000000000..8974f0ff6dc
65 --- /dev/null
66 +++ b/app-misc/yq/yq-2.11.1.ebuild
67 @@ -0,0 +1,48 @@
68 +# Copyright 1999-2020 Gentoo Authors
69 +# Distributed under the terms of the GNU General Public License v2
70 +
71 +EAPI=7
72 +PYTHON_COMPAT=( python3_{6..9} pypy3 )
73 +DISTUTILS_USE_SETUPTOOLS=rdepend
74 +
75 +inherit distutils-r1
76 +
77 +DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
78 +HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
79 +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
80 +LICENSE="Apache-2.0"
81 +SLOT="0"
82 +KEYWORDS="~amd64 ~x86"
83 +IUSE="test"
84 +RESTRICT="!test? ( test )"
85 +
86 +RDEPEND="
87 + app-misc/jq
88 + dev-python/argcomplete[${PYTHON_USEDEP}]
89 + >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
90 + dev-python/xmltodict[${PYTHON_USEDEP}]
91 +"
92 +DEPEND="${RDEPEND}
93 + test? (
94 + dev-python/toml[${PYTHON_USEDEP}]
95 + dev-python/wheel[${PYTHON_USEDEP}]
96 + )
97 +"
98 +
99 +PATCHES=(
100 + "${FILESDIR}/yq-2.11.1-tests.patch"
101 +)
102 +
103 +python_prepare_all() {
104 + sed -e 's:unittest.main():unittest.main(verbosity=2):' \
105 + -i test/test.py || die
106 +
107 + sed -r -i 's:[[:space:]]*"coverage",:: ; s:[[:space:]]*"flake8",::' \
108 + setup.py || die
109 +
110 + distutils-r1_python_prepare_all
111 +}
112 +
113 +python_test() {
114 + "${EPYTHON}" test/test.py </dev/null || die "tests failed under ${EPYTHON}"
115 +}