diff options
Diffstat (limited to 'app-misc/yq')
-rw-r--r-- | app-misc/yq/Manifest | 14 | ||||
-rw-r--r-- | app-misc/yq/files/yq-2.11.1-tests.patch | 13 | ||||
-rw-r--r-- | app-misc/yq/metadata.xml | 4 | ||||
-rw-r--r-- | app-misc/yq/yq-2.11.1.ebuild (renamed from app-misc/yq/yq-2.7.2.ebuild) | 28 | ||||
-rw-r--r-- | app-misc/yq/yq-2.7.1-r1.ebuild | 38 | ||||
-rw-r--r-- | app-misc/yq/yq-2.8.0.ebuild | 38 | ||||
-rw-r--r-- | app-misc/yq/yq-2.9.2-r1.ebuild | 1 | ||||
-rw-r--r-- | app-misc/yq/yq-2.9.2.ebuild | 38 |
8 files changed, 42 insertions, 132 deletions
diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest index 705676d24df5..ec981631c380 100644 --- a/app-misc/yq/Manifest +++ b/app-misc/yq/Manifest @@ -1,10 +1,6 @@ -DIST yq-2.7.1.tar.gz 13794 BLAKE2B 87fe4961974ab41fc14efb7b85c3db5c13577593253eb236c445f59e4034ce5211173cbdd1680e8b83394068ebcc99962f9f3b7c1cd36a4554aa2769b0a5ce66 SHA512 ad76f6102cdb7b0cc82d57c8120dfe10221b7d7456c4c3dd6e5ed0630d9ab178099f4ee8bfc075f15eb4b35aaef4237fcb0ef01a769a612632b4ef774da2b50a -DIST yq-2.7.2.tar.gz 14010 BLAKE2B ec01d25c5ad1ca5fb38b2a4b412306d0ddf157a6a6fdbf2b55452a487bade60ebdd1bddba231e8f0d8db60994c44322c85918221cc64ea346e36d38ca73c185f SHA512 0671d0f5d5dbd7eee42efef7b8469d2177c2459144afc679bcf1f04165ba1e4ae0e396d9a3fa9ecb3db373671152fa51c835ca6fd2622fa8a243b21bfa547e43 -DIST yq-2.8.0.tar.gz 14434 BLAKE2B 1389a4e5df3a5e23fb9d9fad17f7f62b7ce85af917b5a29169ccad71c47d856658ac2fe649df4e98a9980e2548b1170ef468d150d6d84b121f093bd374746e69 SHA512 aca4aea16d80947d030c4c98cfdb431bc8bb25cbbcd388decac84842f7107617b31ef5dd25f409b90094a28452e6623734f7293c16ed75f0e8758b2d53820a09 +AUX yq-2.11.1-tests.patch 577 BLAKE2B e6a6f3fc58b9e260e095d1512cb807946c13f57b7a69f9dc8227287dad5965c94b1ace3f01383f12679455f4603c9b431a326e79e6dc7fb453d686c818bb1584 SHA512 4bb5887b1d5f826a205cfece0eaaddf50c8846cbc108dbaefc465c830d87d9ec3f313d4deeb60ee64fc7a09c1bb295747bb76d6a11c1e6bde3692ef580bbf323 +DIST yq-2.11.1.tar.gz 20660 BLAKE2B 4b51652958121c16462304d21ebe545cca835b6c189a6d7550c7ea0ffc8b7088a02eb61ee412295d85d502a339ec3ccbc67b8dc12cd45a07246cbafa7d7feaf7 SHA512 a59a0b12ac70724bb1b857618a66b8fa38ecd35f37adce0495e74ef194f4547be8adce345f29644d43c3b32c0e680512bfcb527310e17746965f9c1db2b612c1 DIST yq-2.9.2.tar.gz 19177 BLAKE2B 038d813679d3583eb863577f317d834f78f614d6be595c96601a06b40c3af5d9b04234381529012328a45984b183376e0647a6b09b8a87642f8e688e39ec7a7f SHA512 a526407f4f34e9c2a0acccaf38207bbe328468419450efaf30171493123b7715c2e6dd6799679220b07bfa7bc9081ac5f758f833ddf05dfb5e1fe14286baf45c -EBUILD yq-2.7.1-r1.ebuild 1026 BLAKE2B f16a3350bb373c6d96728368e2014d235bf1ff49a6e69af4865efc19c283fcb003e8648bc13961797521726ee35e1824c151f084cdfce04f9e2a6a37be0d52b7 SHA512 5c647494bdd179aea7f1479d3ad53ced5050e7c17c1007094d0fb4b0dc46c99a2547f080b18f9eab0c0b4612b0bbac2230b4c3ded0589fa30614b297e68da01b -EBUILD yq-2.7.2.ebuild 1030 BLAKE2B 896b5db720a2736274ddffcba9f25116b48209fcb31293b6bbbd6d154086997687bee16175d123c99a80697e9a4282aad0d2aa346b11eaf1512f073d636bec65 SHA512 40e43aa98b92860891c14cf05a0c4ac8ba7be6c02f83af4d844318cca93532eced9a90139e494db5c4ed535d656376335c6621afeec14222981ee7545a79e761 -EBUILD yq-2.8.0.ebuild 1030 BLAKE2B 896b5db720a2736274ddffcba9f25116b48209fcb31293b6bbbd6d154086997687bee16175d123c99a80697e9a4282aad0d2aa346b11eaf1512f073d636bec65 SHA512 40e43aa98b92860891c14cf05a0c4ac8ba7be6c02f83af4d844318cca93532eced9a90139e494db5c4ed535d656376335c6621afeec14222981ee7545a79e761 -EBUILD yq-2.9.2-r1.ebuild 1062 BLAKE2B 77585c8f4ebdaf14d54798abb7d85b7d9b6cf3570066fb86293d7a335607efbed9fec0fe22668fad9ccc401fc4214cd04f19a84341af9a2c2f9eef2caafcf104 SHA512 f3de65dbc4f86bb4b48ee106b92c5d5f6930ac20bf13319cb617aed51de36067ceec0421fc97080db301b5d82edf8fd77c46cad354894ebba328bd3826aa586d -EBUILD yq-2.9.2.ebuild 1030 BLAKE2B 896b5db720a2736274ddffcba9f25116b48209fcb31293b6bbbd6d154086997687bee16175d123c99a80697e9a4282aad0d2aa346b11eaf1512f073d636bec65 SHA512 40e43aa98b92860891c14cf05a0c4ac8ba7be6c02f83af4d844318cca93532eced9a90139e494db5c4ed535d656376335c6621afeec14222981ee7545a79e761 -MISC metadata.xml 333 BLAKE2B 25cb1f46ef4320b5b01b23bec540f623f53be1ee4b0a1d3d9c20cdd90185b88d8f9d5fecefbd15abeca1a861e2863123d15e89e40aa3cdbbd1c56fefa71105f4 SHA512 2cb6c56e50e0d436f37c090549cdeb0c4b1fba34b8049c90ccf24f44aaefddd87bd8e6260a8e645df2c8e2bb1f28c305ae353f1a86e2992a2c987936c4caa416 +EBUILD yq-2.11.1.ebuild 1160 BLAKE2B ddf3a37195430e1143a98a1855433f32e4f9374fc93fb16c368ea91ba5bf9640fc1a23a42f2d24ec0686d7e4e5abe34647579366757268335b3c5322e315c017 SHA512 07a108ad28384510f898a364afda436cc0cb3e4f60c92d2301fd1fe8a4ad80ddc798a0028874e0f8edfc73e539af45f81c809349180b107c38b596ef2739257b +EBUILD yq-2.9.2-r1.ebuild 1095 BLAKE2B 1e1665f84030da54124923f46ac2d51a3b625af157c02c206510c829c4a9f12df98b9d0358d170fd6804a9b6403eb3713c36f18d60ea476ab58b51384392965d SHA512 a6ccddb8566677d914ebb106776c1128e4bbd052ee278ea42640de6af7c9213a456275b6d92867fdb97df1650fa8042d687098a32cb6da683d8fb7b38315cecc +MISC metadata.xml 443 BLAKE2B b03eb10c7812eeb11f3020dea57cb86468743cf4385eac2bd306c33e504536984b22f35a7d2b7775951262954e54a2cae9a62a66dcb8759057cc0f92eccd9ad1 SHA512 e9b2a25b209e2e60d399e519453a9b3d052471bda9dc9548bf4986005899bf89823548d9782c7cef1ad7f150b9e15777ef125099df1e67d3fb28f84b198adf14 diff --git a/app-misc/yq/files/yq-2.11.1-tests.patch b/app-misc/yq/files/yq-2.11.1-tests.patch new file mode 100644 index 000000000000..6b6231ad7eed --- /dev/null +++ b/app-misc/yq/files/yq-2.11.1-tests.patch @@ -0,0 +1,13 @@ +diff --git a/test/test.py b/test/test.py +index a81f41b..f17f03c 100755 +--- a/test/test.py ++++ b/test/test.py +@@ -84,7 +84,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/app-misc/yq/metadata.xml b/app-misc/yq/metadata.xml index 37885efab095..65f1771cc5d9 100644 --- a/app-misc/yq/metadata.xml +++ b/app-misc/yq/metadata.xml @@ -8,4 +8,8 @@ <maintainer type="person"> <email>zmedico@gentoo.org</email> </maintainer> + <maintainer type="person"> + <email>chutzpah@gentoo.org</email> + <name>Patrick McLean</name> + </maintainer> </pkgmetadata> diff --git a/app-misc/yq/yq-2.7.2.ebuild b/app-misc/yq/yq-2.11.1.ebuild index f091efa90988..8974f0ff6dcf 100644 --- a/app-misc/yq/yq-2.7.2.ebuild +++ b/app-misc/yq/yq-2.11.1.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6..9} pypy3 ) +DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 @@ -15,24 +16,33 @@ KEYWORDS="~amd64 ~x86" IUSE="test" RESTRICT="!test? ( test )" -RDEPEND="app-misc/jq +RDEPEND=" + app-misc/jq + dev-python/argcomplete[${PYTHON_USEDEP}] >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/xmltodict[${PYTHON_USEDEP}]" + dev-python/xmltodict[${PYTHON_USEDEP}] +" DEPEND="${RDEPEND} test? ( - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/flake8[${PYTHON_USEDEP}] dev-python/toml[${PYTHON_USEDEP}] dev-python/wheel[${PYTHON_USEDEP}] - )" + ) +" + +PATCHES=( + "${FILESDIR}/yq-2.11.1-tests.patch" +) python_prepare_all() { - distutils-r1_python_prepare_all sed -e 's:unittest.main():unittest.main(verbosity=2):' \ -i test/test.py || die + + sed -r -i 's:[[:space:]]*"coverage",:: ; s:[[:space:]]*"flake8",::' \ + setup.py || die + + distutils-r1_python_prepare_all } python_test() { - ./test/test.py || die "tests failed under ${EPYTHON}" + "${EPYTHON}" test/test.py </dev/null || die "tests failed under ${EPYTHON}" } diff --git a/app-misc/yq/yq-2.7.1-r1.ebuild b/app-misc/yq/yq-2.7.1-r1.ebuild deleted file mode 100644 index 2559bf50e6bf..000000000000 --- a/app-misc/yq/yq-2.7.1-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents" -HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="app-misc/jq - >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/xmltodict[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/flake8[${PYTHON_USEDEP}] - dev-python/toml[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - )" - -python_prepare_all() { - distutils-r1_python_prepare_all - sed -e 's:unittest.main():unittest.main(verbosity=2):' \ - -i test/test.py || die -} - -python_test() { - ./test/test.py || die "tests failed under ${EPYTHON}" -} diff --git a/app-misc/yq/yq-2.8.0.ebuild b/app-misc/yq/yq-2.8.0.ebuild deleted file mode 100644 index f091efa90988..000000000000 --- a/app-misc/yq/yq-2.8.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) - -inherit distutils-r1 - -DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents" -HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="app-misc/jq - >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/xmltodict[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/flake8[${PYTHON_USEDEP}] - dev-python/toml[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - )" - -python_prepare_all() { - distutils-r1_python_prepare_all - sed -e 's:unittest.main():unittest.main(verbosity=2):' \ - -i test/test.py || die -} - -python_test() { - ./test/test.py || die "tests failed under ${EPYTHON}" -} diff --git a/app-misc/yq/yq-2.9.2-r1.ebuild b/app-misc/yq/yq-2.9.2-r1.ebuild index 3853856388ac..67193e27d552 100644 --- a/app-misc/yq/yq-2.9.2-r1.ebuild +++ b/app-misc/yq/yq-2.9.2-r1.ebuild @@ -3,6 +3,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) +DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 diff --git a/app-misc/yq/yq-2.9.2.ebuild b/app-misc/yq/yq-2.9.2.ebuild deleted file mode 100644 index f091efa90988..000000000000 --- a/app-misc/yq/yq-2.9.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) - -inherit distutils-r1 - -DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents" -HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="app-misc/jq - >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/xmltodict[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/flake8[${PYTHON_USEDEP}] - dev-python/toml[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - )" - -python_prepare_all() { - distutils-r1_python_prepare_all - sed -e 's:unittest.main():unittest.main(verbosity=2):' \ - -i test/test.py || die -} - -python_test() { - ./test/test.py || die "tests failed under ${EPYTHON}" -} |