From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- dev-python/pytest/Manifest | 12 +++---- dev-python/pytest/pytest-3.10.1.ebuild | 14 ++++---- dev-python/pytest/pytest-4.5.0.ebuild | 10 +++--- dev-python/pytest/pytest-4.6.9.ebuild | 10 +++--- dev-python/pytest/pytest-5.3.4.ebuild | 66 ---------------------------------- dev-python/pytest/pytest-5.3.5.ebuild | 66 ---------------------------------- dev-python/pytest/pytest-5.4.1.ebuild | 61 +++++++++++++++++++++++++++++++ 7 files changed, 86 insertions(+), 153 deletions(-) delete mode 100644 dev-python/pytest/pytest-5.3.4.ebuild delete mode 100644 dev-python/pytest/pytest-5.3.5.ebuild create mode 100644 dev-python/pytest/pytest-5.4.1.ebuild (limited to 'dev-python/pytest') diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest index 67d9296eb8d3..b9dd157210a0 100644 --- a/dev-python/pytest/Manifest +++ b/dev-python/pytest/Manifest @@ -2,11 +2,9 @@ AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c10faff221330ea0ae7482a2a7d0fb9443a0a264db00f1d92568d5a6005cb73e07d8643b46906f7ecff831adcb SHA512 cbffc6216f83491b1de241058315c116697bfaa5206b5f558192a7f861d43dd036d30d0d689bedae7bdee4f0258dd19ef5827c356e11863dd596a5fabe8249fc DIST pytest-4.6.9.tar.gz 956816 BLAKE2B 7eaeaa0d47c17836a35d9cdc97663f8ef65253099b21d60a7ffc3655d8bd93c6b4e33045caa6c8ab9bb8b920b93e596ba86d8eac4ab07b3b7a5989b38312f4fc SHA512 ab45a8662aa798a6ae224ad2cd68e043c605e4830c76cb6c6aca3cfccef232c024cbbb6c48c9bae19148099c339abfef3270a2208cc7e5c37a10b34b0aa6ba79 -DIST pytest-5.3.4.tar.gz 990897 BLAKE2B dd6f0a277352dd72e6348e89813a7df50aabf9ee134afd69412100b87a7898128ec6b17bf29082c88554b66ba5622b7e0b9a1338d6b740795f33055a9279cfdc SHA512 562966d74d2ff12715ececa46acdd49de67f5e792687d52b3f53589f6dc6105aed09bd4c5098989d70b8a69e6bb4cfb9c0b1ee7e9cfc8e8252e3ba6b4d39e4bc -DIST pytest-5.3.5.tar.gz 990935 BLAKE2B 257628ca9bf7b5e17eb54d868f37fc18a6cc43e66e7ec64581aae0faa8c92a9aa102f011e3117f6c669fc3dfa27fb884c2fefea6b0771fa0ed8999364bc4e149 SHA512 14877d67aef83d498c8a2917b9633bda317948fa889100e6d1a00547a71f0bfb32d8a01506e97bab6372bfbae17a03aa21bdad8d81072a163a5c9c042498a3b3 -EBUILD pytest-3.10.1.ebuild 2440 BLAKE2B 1387677713282155a15b2f24e5ed62c070cfd00aec9629771cfa655b5dff25a7c6d5461f28ec3a3c33804eb7f1943e487bc8516d817bc3818a453250eaa216ae SHA512 82182a05a96951ddc874756b0dc576c7058762d386f8332c8150bb181103c7c95ea7ce3248646193f049fb182f018c614210a30dc2990d7cb626a630d803a593 -EBUILD pytest-4.5.0.ebuild 2087 BLAKE2B 5885f2b8e0b1d7954c0bf7682cd8ee8dd94d09a3d1b6f151ebb543a0ac17b84b9822d3497f7c89699011f250221ab440b5de73049c80974ef4332550f091dc9d SHA512 b4cea619b2f9ceaeb5b3411aff6d8d802ab831ac7c56fe5f244938043b514af84820fb0589800d971caa8674efb5460a98d0963259e45b4007cc715e813d3bc8 -EBUILD pytest-4.6.9.ebuild 2276 BLAKE2B 151a17641bf5fc248566da939c9cc7d46095474a79b7b0fede67238a8b9455591921df75ff1a02475464f3a37c7b16c371d0d9ddbe0f75fb5374039eee7bf0b6 SHA512 a4a12294731d78a407ae208fe1cd85d70b2f67d6efdc14a9282724692b32d224635859ae75c8726b2efa2c9716fc89cf997ba387d885748e9703e8bd8e1a3450 -EBUILD pytest-5.3.4.ebuild 1779 BLAKE2B b037143c812281a7e0d3bbead01e6d281580497830eab33d88eba888172be6f41d1845751daaf251026527bedeee1d1eb6bc1016135898b506d615db2464fa59 SHA512 d18e1f22ec79987883035e843ab601e6633dc614d02d0681b4da4cd6601528fec12782a3eae9ad9e5bee91017ac6fe45f789ab3496a7b362b52e8dfd49c0e77b -EBUILD pytest-5.3.5.ebuild 1791 BLAKE2B 6af1e7ea1e9736644f19e3b73971b1c1b5918ea7ff599bbd0705eae0a2f5bc5c1ff9d17897c6fda59c07fa4d5a2faadb3fa9899e6d99bdb0c85dc606786d9c76 SHA512 c69de2f12d30e85b932d337fe5a3ff89eddcbe7dab0d184a12675801a6c68deb6dbe7c69e9bb1ba5d7612a6e4a30edde4d9653cae15479465fe3e01ecbd945c0 +DIST pytest-5.4.1.tar.gz 1017924 BLAKE2B 2892b06655384c8453963e8444e7c1659f4ce60410afe6d01c480da4858628f6c8fd8774131c5bfaca3b3baf9936e3e4d607788b390d37f7aee90cb39c4ba15c SHA512 50d94158817561316cfb4c6ad4481858a76cfe44ba964cc7a3bb81d3701eb621ca5cd46c4be24644134417d8bf7e7771f4b3a30af71fde5ea9705c3241fa2878 +EBUILD pytest-3.10.1.ebuild 2366 BLAKE2B 7f7617f2d4bb90edbd0350297870c823f7525e2f18d984fe9a12cd8bbcd4dcce461e3a7f43c1d5ba8ecbb90d7606f76f0ecf336d7a0933baa6cff22417aa4efe SHA512 1104eea0003f68645660eebc1b3ca8736cea46f99de40637955169168c1efe07ca90ef8967d31bcb470f5e1aa831ed0b572b9156671bc718dc1da8d18c96a8cb +EBUILD pytest-4.5.0.ebuild 2082 BLAKE2B d2e9edae4f7751ccdbccd6b3c98e77a67aa3aacc77eaec413fd05d1cb65eb6e48c52a181993d8e0cb83ce9d26d23ce4590d398ecddb2c6a72a15ec4d57538ffc SHA512 41dc00468a3b5f16275ced0ff703e9fe53a618a82b8da9e11a0a4a1dc5dc82c1eb666679498e1df1c7ff67540f786e8f419570a93be0d361fbf44678b7dd527b +EBUILD pytest-4.6.9.ebuild 2304 BLAKE2B fc7b70ceba6a9cd911c30f88fd702ef15b932913c82bf0c8d9efdb44e7d97c03e218b191939b80de2b7d3205df3e920d7129aa0c5bcf4cb56c24c7de400c057b SHA512 9afba989ced217e8db9c97a337cca929364e926cb526618aec9436d53f046b60d67ac8fdf108d608543e1bbc40c65ec6941364e52d406346b189e9c9a3890ca5 +EBUILD pytest-5.4.1.ebuild 1635 BLAKE2B 0209e7106a0fddaafc7b6800e7ef270c7948611b0cb99313ee039ccaed43069f522b1e559531568d3d5094f216f1bd893a0be59b6dbc9667a8d96aba71ce0548 SHA512 63ca5eafa52bdff9d97b8758bf9fa7e7185c63993a3625123fc4e76e0635646ec7de80d9df9604c02591ba5332cf5d5c6974f16d22f0bc5f438c7389cefd2c2f MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild index c4d2de67cde7..58d5ac51c856 100644 --- a/dev-python/pytest/pytest-3.10.1.ebuild +++ b/dev-python/pytest/pytest-3.10.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" @@ -25,15 +25,17 @@ PY_VER="1.5.0" RDEPEND=" >=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}] >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python2_7 ) - $(python_gen_cond_dep '=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] + =dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python3_{6,7} pypy{,3} ) - $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7) >=dev-python/pluggy-0.7[${PYTHON_USEDEP}] >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] >=dev-python/setuptools-40[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - virtual/python-funcsigs[${PYTHON_USEDEP}]" + >=dev-python/six-1.10.0[${PYTHON_USEDEP}]" # flake & pytest-capturelog cause a number of tests to fail DEPEND="${RDEPEND} diff --git a/dev-python/pytest/pytest-4.5.0.ebuild b/dev-python/pytest/pytest-4.5.0.ebuild index f9bfdba1a65a..a83f1311e0a9 100644 --- a/dev-python/pytest/pytest-4.5.0.ebuild +++ b/dev-python/pytest/pytest-4.5.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="test" RESTRICT="!test? ( test )" @@ -26,14 +26,16 @@ RDEPEND=" >=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}] >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7) + $(python_gen_cond_dep ' + dev-python/pathlib2[${PYTHON_USEDEP}] + dev-python/funcsigs[${PYTHON_USEDEP}] + ' -2) >=dev-python/pluggy-0.11[${PYTHON_USEDEP}] =dev-python/py-${PY_VER}[${PYTHON_USEDEP}] >=dev-python/setuptools-40[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] - dev-python/wcwidth[${PYTHON_USEDEP}] - virtual/python-funcsigs[${PYTHON_USEDEP}]" + dev-python/wcwidth[${PYTHON_USEDEP}]" # flake cause a number of tests to fail DEPEND="${RDEPEND} diff --git a/dev-python/pytest/pytest-4.6.9.ebuild b/dev-python/pytest/pytest-4.6.9.ebuild index b20aeccb93dc..f9670e424962 100644 --- a/dev-python/pytest/pytest-4.6.9.ebuild +++ b/dev-python/pytest/pytest-4.6.9.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~hppa x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc64 x86" IUSE="test" RESTRICT="!test? ( test )" @@ -28,14 +28,16 @@ RDEPEND=" >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] $(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' \ -2 python3_{5,6,7} pypy3) - $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2) + $(python_gen_cond_dep ' + dev-python/pathlib2[${PYTHON_USEDEP}] + dev-python/funcsigs[${PYTHON_USEDEP}] + ' -2) >=dev-python/pluggy-0.12[${PYTHON_USEDEP}] =dev-python/py-${PY_VER}[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] - dev-python/wcwidth[${PYTHON_USEDEP}] - virtual/python-funcsigs[${PYTHON_USEDEP}]" + dev-python/wcwidth[${PYTHON_USEDEP}]" # flake cause a number of tests to fail DEPEND=" diff --git a/dev-python/pytest/pytest-5.3.4.ebuild b/dev-python/pytest/pytest-5.3.4.ebuild deleted file mode 100644 index 1be7d663ccd2..000000000000 --- a/dev-python/pytest/pytest-5.3.4.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit distutils-r1 - -DESCRIPTION="Simple powerful testing with Python" -HOMEPAGE="https://pytest.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -# When bumping, please check setup.py for the proper py version -PY_VER="1.5.0" - -# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__ -# support, which only came in py3.6. -RDEPEND=" - >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] - dev-python/importlib_metadata[${PYTHON_USEDEP}] - >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - >=dev-python/pluggy-0.12[${PYTHON_USEDEP}] - =dev-python/py-${PY_VER}[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/wcwidth[${PYTHON_USEDEP}] - virtual/python-funcsigs[${PYTHON_USEDEP}]" - -# flake cause a number of tests to fail -DEPEND="${RDEPEND} - test? ( - >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/xmlschema[${PYTHON_USEDEP}] - !!dev-python/flaky - )" - -PATCHES=( - "${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch -) - -python_prepare_all() { - grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" - - # Something in the ebuild environment causes this to hang/error. - # https://bugs.gentoo.org/598442 - rm testing/test_pdb.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - "${EPYTHON}" -m pytest -vv --lsof -rfsxX \ - || die "tests failed with ${EPYTHON}" -} diff --git a/dev-python/pytest/pytest-5.3.5.ebuild b/dev-python/pytest/pytest-5.3.5.ebuild deleted file mode 100644 index 33a14f2edb10..000000000000 --- a/dev-python/pytest/pytest-5.3.5.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Simple powerful testing with Python" -HOMEPAGE="https://pytest.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -# When bumping, please check setup.py for the proper py version -PY_VER="1.5.0" - -# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__ -# support, which only came in py3.6. -RDEPEND=" - >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] - dev-python/importlib_metadata[${PYTHON_USEDEP}] - >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - >=dev-python/pluggy-0.12[${PYTHON_USEDEP}] - =dev-python/py-${PY_VER}[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/wcwidth[${PYTHON_USEDEP}] - virtual/python-funcsigs[${PYTHON_USEDEP}]" - -# flake cause a number of tests to fail -DEPEND="${RDEPEND} - test? ( - >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/xmlschema[${PYTHON_USEDEP}] - !!dev-python/flaky - )" - -PATCHES=( - "${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch -) - -python_prepare_all() { - grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" - - # Something in the ebuild environment causes this to hang/error. - # https://bugs.gentoo.org/598442 - rm testing/test_pdb.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - "${EPYTHON}" -m pytest -vv --lsof -rfsxX \ - || die "tests failed with ${EPYTHON}" -} diff --git a/dev-python/pytest/pytest-5.4.1.ebuild b/dev-python/pytest/pytest-5.4.1.ebuild new file mode 100644 index 000000000000..433ef86c4e7e --- /dev/null +++ b/dev-python/pytest/pytest-5.4.1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Simple powerful testing with Python" +HOMEPAGE="https://pytest.org/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +# When bumping, please check setup.py for the proper py version +PY_VER="1.5.0" + +# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__ +# support, which only came in py3.6. +RDEPEND=" + >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] + dev-python/importlib_metadata[${PYTHON_USEDEP}] + >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + >=dev-python/pluggy-0.12[${PYTHON_USEDEP}] + =dev-python/py-${PY_VER}[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/wcwidth[${PYTHON_USEDEP}]" + +# flake cause a number of tests to fail +DEPEND="${RDEPEND} + test? ( + >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/xmlschema[${PYTHON_USEDEP}] + !!dev-python/flaky + )" + +PATCHES=( + "${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch +) + +python_prepare_all() { + grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" + + distutils-r1_python_prepare_all +} + +python_test() { + "${EPYTHON}" -m pytest -vv --lsof -rfsxX \ + || die "tests failed with ${EPYTHON}" +} -- cgit v1.2.3