diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 86466a873..2cfc5ce3a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -6,6 +6,7 @@ * update pwmled-1.6.7 * bump pigpio-1.78 * bump pyTibber-0.16.0 + * update pytest-6.1.2 2020-11-07 * update xknx-0.15.0-r1 (add a dep for standalone installation) diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest index 89775b89b..2afd25b98 100644 --- a/dev-python/pytest/Manifest +++ b/dev-python/pytest/Manifest @@ -1,13 +1,13 @@ AUX pytest-3.4.2-pypy-syntaxerror-offset.patch 996 BLAKE2B ff6d362d20f6432f73956e1aee4c2bc596e3d8e3347da3624dfd3cbfdd1eabd8872058737e8f9b558f3570878756c7b87a65514956b1e81235c2727e8ff2fc63 SHA512 4a28ddc07389aac79e46528e85229aba126a89c27b7bec73b406766be49f5c8be9bdc2cb3158bfb475b4d6371e2f33960e1ed154e3b9eda15aeb8b151f3d2148 AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a0124dc4f35892b18ecbcce34280a00774012822fced0045ac7113a50f8f88d042b88e404dbf4d8d3760140c66a48daa3da2a44c6 SHA512 d34d7c1db57804f0d1ff71f3f51c9a736592945fdf564f54c0c20c398c86f08616eb21f75d77457a71738df4d254ec3d69e46aa3378dea6f7913933bcdf45c08 -DIST pytest-5.3.0.tar.gz 992537 BLAKE2B 4386d1623bdc168313a75847dfa33413ab1b6a4de9380c67ae866a579dbeb62d8cd18da899bf0476827d6e4a76ddfc5fee7a2fdc652eff0c8848c0bd96045c47 SHA512 285d0b4f6b87b141d6d5dac368dc46eb80dd025d7ed4ad0db937fcc76efc1f8cf251ca9b0786ab1bdadd89c07ad8ddd74f2b3496f97326e9d7fccfd004b98aff DIST pytest-5.3.2.tar.gz 995560 BLAKE2B aaea9d89e884a82056eeea3068c70604c73d50c96b8d78c6ee14c67bbe066f0e6d882c1b8f95539a2338d6739e047680d901a9db108b1923fa4d3d03dc3f2115 SHA512 2ab39973848d2d4693edd1dbd7ab2798b574026c9277bddd4a18e57aec65b3d93de201e87f58eb26030183b5c71818e6e56bcc1cda8c50892546cb1c04d6984a DIST pytest-5.3.5.tar.gz 990935 BLAKE2B 257628ca9bf7b5e17eb54d868f37fc18a6cc43e66e7ec64581aae0faa8c92a9aa102f011e3117f6c669fc3dfa27fb884c2fefea6b0771fa0ed8999364bc4e149 SHA512 14877d67aef83d498c8a2917b9633bda317948fa889100e6d1a00547a71f0bfb32d8a01506e97bab6372bfbae17a03aa21bdad8d81072a163a5c9c042498a3b3 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e DIST pytest-6.0.2.tar.gz 1070533 BLAKE2B 54397bdf8255641e1cb0555a78b3687a49376d9cc603a98b6df3415159aef0331cbaa7d0883bafbceea1b2273fc0ba5c867f7b66eef5b2b4c24f3e5196786877 SHA512 478d28c30f4f990dcdd98edcd074051e32d9ab25941c21bdc9c4cc47b726da79b5b3a01572ff97f608598ef6bb9df075ebba49abb2f1420947e0c6d4fe0be9c8 -EBUILD pytest-5.3.0.ebuild 2206 BLAKE2B 8f24f9f16406b9bb60831e7a1a842e44ca439172d123695fabc2af25bf0feaa8ef31c0df907942490af2398b0b38bd8ffdc5e46c744258ed0a927d267c00a84f SHA512 1dcb9c5c778dc12712f926ec9c12988f77059843a687ca568fb9e2f9125b3ed6e84fdf4fabb95b474815ef01cc3313bc5d4cbb1815575981110910614404d229 +DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1 EBUILD pytest-5.3.2.ebuild 2206 BLAKE2B 8f24f9f16406b9bb60831e7a1a842e44ca439172d123695fabc2af25bf0feaa8ef31c0df907942490af2398b0b38bd8ffdc5e46c744258ed0a927d267c00a84f SHA512 1dcb9c5c778dc12712f926ec9c12988f77059843a687ca568fb9e2f9125b3ed6e84fdf4fabb95b474815ef01cc3313bc5d4cbb1815575981110910614404d229 EBUILD pytest-5.3.5.ebuild 1810 BLAKE2B d4b76159617a8b8af60000c53995847e7ff0ee8d9f10771a5c3ddc9c7b08ce4be73e160823606b18f36cf20db729e1e53d574fc533a27c97818384ec4554b467 SHA512 2d673efbd747d059d56d038ce0f222005b2295ec5c308412307e4a192aa720520e7c7678ff46aa2f455df000196868ed455bf3bddf2d5ee6fce8693a49417bb7 EBUILD pytest-5.4.3.ebuild 1900 BLAKE2B 2227f663c00602a3f87ccb5940f4fa9ead303aea4f3b029707193d745a09794ed624a91ee74bd9ef38d3483a4734064c4571bb9d33b7966afc21d269107a2549 SHA512 cfee0c3f61b2c49a8466cbc2d68fcc5c95e30c7972dcc880b6b10d14d91d56dfccaefdfc2df657ccecaf63cf7ba127efc390c2ecf5576a486e84778914212fb9 EBUILD pytest-6.0.2.ebuild 1627 BLAKE2B e1e8351b170eb21363d70546100205c5d84c3e9b61fe6b7ec361f497c00fc9d4ad9a53a892519c67deba80633148776d5063f2f90f9753d99b6853884b81c08f SHA512 93a855366c9770b3d498aa01fabffd7b830e7e996ce1cdcba776af589f10acf5ee60a303d2aa62bb2a04479f6c7941c383f0f39f8891ad7edb6ef3e499ac013b -MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f +EBUILD pytest-6.1.2.ebuild 1645 BLAKE2B 86f1428f01d05acc1b3c64fe989d7a35b09ce3407e08d49ff582d40c4999d768c56ee4088dc4c6c3bd0d9852ef8a83fcf0de5e7a0f7cc397ab2951b9711bc936 SHA512 e8e0006c7a66b44b96a49d850baf2ca4cdfb249ec46f65ec5b5faa1318777976d3fa25614215f38a099cd7ad1524cefac84a9a55f7bba911d8f89e1947fe4d7e +MISC metadata.xml 325 BLAKE2B 7c113b2ddb2bf82043ec459face1fce737ca84820fd277b8885f291ab0bc194244a3e61e2bd21f81a6ca6a03d30d32b86b748622b100cccaf145f415d244526f SHA512 1613c1866928f45ad4bee8fce44ed6fb3af9671b882e89e98f90b6f488f76250bf30fe46184eb59df81a46da9dd9f040f14e09e5ee0c17bc0e2730c01b812c85 diff --git a/dev-python/pytest/metadata.xml b/dev-python/pytest/metadata.xml index 6b44047e1..d8583cf43 100644 --- a/dev-python/pytest/metadata.xml +++ b/dev-python/pytest/metadata.xml @@ -1,11 +1,11 @@ - + - - python@gentoo.org - Python - - - pytest - + + b@edevau.net + Andreas Billmeier + + + pytest + diff --git a/dev-python/pytest/pytest-5.3.0.ebuild b/dev-python/pytest/pytest-5.3.0.ebuild deleted file mode 100644 index 1b400fbc6..000000000 --- a/dev-python/pytest/pytest-5.3.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) - -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 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="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/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-2.2.0[${PYTHON_USEDEP}]' python2_7 python3_5 ) - >=dev-python/pluggy-0.12[${PYTHON_USEDEP}] - =dev-python/importlib_metadata-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}]" - -# flake cause a number of tests to fail -DEPEND="${RDEPEND} - >=dev-python/setuptools-40[${PYTHON_USEDEP}] - dev-python/setuptools_scm[${PYTHON_USEDEP}] - test? ( - >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2) - dev-python/requests[${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() { - # In v4.1.1, pytest started being picky about its own verbosity options. - # running pytest on itself with -vv made 3 tests fail. This is why we don't - # have it below. - "${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \ - || die "tests failed with ${EPYTHON}" -} diff --git a/dev-python/pytest/pytest-6.1.2.ebuild b/dev-python/pytest/pytest-6.1.2.ebuild new file mode 100644 index 000000000..f101893a5 --- /dev/null +++ b/dev-python/pytest/pytest-6.1.2.ebuild @@ -0,0 +1,62 @@ +# 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..9} 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 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/importlib_metadata[${PYTHON_USEDEP}] + ' python3_{6,7} pypy3) + dev-python/iniconfig[${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-1.8.2[${PYTHON_USEDEP}] + dev-python/toml[${PYTHON_USEDEP}] +" +# flake cause a number of tests to fail +DEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + dev-python/argcomplete[${PYTHON_USEDEP}] + >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/xmlschema[${PYTHON_USEDEP}] + !!dev-python/flaky + )" + +python_prepare_all() { + # fragile to warnings from other packages (setuptools) + # little value for us to run it + sed -i -e 's:test_no_warnings:_&:' \ + testing/test_meta.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + distutils_install_for_testing + + "${EPYTHON}" -m pytest -vv --lsof -rfsxX || + die "Tests failed with ${EPYTHON}" +}