diff options
Diffstat (limited to 'dev-python/pytest')
| -rw-r--r-- | dev-python/pytest/Manifest | 7 | ||||
| -rw-r--r-- | dev-python/pytest/files/pytest-6.2.4-py310.patch | 34 | ||||
| -rw-r--r-- | dev-python/pytest/pytest-6.1.2.ebuild | 62 | ||||
| -rw-r--r-- | dev-python/pytest/pytest-6.2.4-r1.ebuild | 64 | ||||
| -rw-r--r-- | dev-python/pytest/pytest-6.2.5.ebuild | 2 |
5 files changed, 2 insertions, 167 deletions
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest index 3ed441599541..7d40c9a6aaf2 100644 --- a/dev-python/pytest/Manifest +++ b/dev-python/pytest/Manifest @@ -1,11 +1,6 @@ AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a0124dc4f35892b18ecbcce34280a00774012822fced0045ac7113a50f8f88d042b88e404dbf4d8d3760140c66a48daa3da2a44c6 SHA512 d34d7c1db57804f0d1ff71f3f51c9a736592945fdf564f54c0c20c398c86f08616eb21f75d77457a71738df4d254ec3d69e46aa3378dea6f7913933bcdf45c08 -AUX pytest-6.2.4-py310.patch 1288 BLAKE2B 7fc0054de8a991f71fec041372839b8df52da5e1d5ac88b9e813f8456892839e3bbd63d6f8593989d7912b24bc552fe5f3a83c1cdee5161333721531b1e9d3c2 SHA512 715318d9b6520e31df6399957d14c7bba608288152359101a84b20b139d289be584f7b87856bbdef4eb4b2c85415ae679a6c018caeab4f9d228a4f1cf3a8d2ef DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e -DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1 -DIST pytest-6.2.4.tar.gz 1118084 BLAKE2B 611db50e7432dfb6f8d212621a3803871fd8f6c05ec3cdefeb3958d0886f754326fc358a9a67bdb3f516388aab901b169c951471bf304adfb78fe457dc59d6c5 SHA512 43adc9a78e16a05f07e689e4557b63f2e0f4de5a1cdea6f24272b6a658a6b0a18721713cf46b5102cf2726ddbc4ffe131c39e652bd2511d285f40cbfcccc2289 DIST pytest-6.2.5.tar.gz 1118720 BLAKE2B 9dfc87279617be58353566009325f929e6fa53d54fd4c665a75f3b359ab5415972d745a680eb85ab21ca9eaec84450bc1decd50566b0ccdf90d7551f3d03ee70 SHA512 7624563a9d967da4cbf82cfff90bae8c0cca07b32e291dc7c5efa787725ed1a255edd066bf0d5fbd89b8cbed8cf5b619fe7c7017f44a7f8a014e3310c06bdbf9 EBUILD pytest-5.4.3.ebuild 1938 BLAKE2B e40cc338970d931c7cd51b5a6377f5d73cae21789fcea2a6f2b401f92fb9dbe6e12c45b3357a10b76c0d6bc11708f35b8fc65a3b7084328b5664c0ad2baa6c77 SHA512 dbfc71f4a77d366a1eb55d38a1c8f209f6e6d42fe22d0604a5695d8e99faae05883b82fec45b7192399ccbc7bddc25997291fca9638edc01d961b292190d25e1 -EBUILD pytest-6.1.2.ebuild 1662 BLAKE2B dddcee1dba302a810b80dd9832edc6af6f044ab728497498b5b4b762dfbe383d7255fce15b0615c37c3857ee2353546de2ee6b7093b01651f43ad4df7cbbfaf6 SHA512 e9ba570887b4ff0889abc2db20b3de2e634be5ba5ba60679f45c466006d3f7626c329c65f427b1cc6ede1942d2786ef4da44528a82d8be09752e1e028dcad2f6 -EBUILD pytest-6.2.4-r1.ebuild 1719 BLAKE2B a6bb7f7cd393d8d5bff4d6f563f621328eaee18ed482e1dea2b14dcfc9540515868507eb769c2522d140285417f822db158c5f3598eeee62f001b73a9b37bf27 SHA512 71e8a53b22f5093b577be42a5a3cdebb1c2aefc77f4fac25ad8bf4d980c1c0b8cd1d09f7e9e6348df776814e180ca172a356ad4816f8f0ef05ad5cf5930d30db -EBUILD pytest-6.2.5.ebuild 1550 BLAKE2B 1013687f0e76b7fe4cbd9de38fb74387d0c61198152d827015eeee6c2b64743dc88a3a836c9dc2c89b9679da0b5d7a0bd76c7ca3c86418756bc092769393ba25 SHA512 8f2e656fd12726497eff17782e9c452004a6d47492411ed096dfa7969904e2b7be45d7d61f30f6ee08a0ebbe76630b115ea570c4d86e6be8e717a9d686c22635 +EBUILD pytest-6.2.5.ebuild 1542 BLAKE2B 5edd074d7608a87dbcf7565ed84809359151de7f751b7ae9e599f7f26f57d955c5def9a2d6545a76e5bfd54684abe1d8673251f91ed33975856addc2293befed SHA512 be5f1a4ab957004f1595ef9ada0d3bbf6e1d2c677a286a0d6f03a5e8339e3d739963d060068e7b3760b65eae1afccf3b1719c73f0143ac6a99ada64fc73cb04f MISC metadata.xml 391 BLAKE2B 48d31ecb4c8b171ee4e84a58399211368ddc00dfb5dbe0999f96e03d744294cd4fd5263e90600c93d1f13c7da21052faef84b6d0d56709f3559e37b3392ca31d SHA512 6e9caa57eda23995d21df6f52c52d5868e1ff56abb6c1351ffc0fe14b771639473481a2630e659caaff83f0255379aa2d012175af52a0de41221b27d3ab2f425 diff --git a/dev-python/pytest/files/pytest-6.2.4-py310.patch b/dev-python/pytest/files/pytest-6.2.4-py310.patch deleted file mode 100644 index 88c8f703f08a..000000000000 --- a/dev-python/pytest/files/pytest-6.2.4-py310.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 78fb97105f38dc286353bbc331a243b6e753fe3c Mon Sep 17 00:00:00 2001 -From: Petr Viktorin <encukou@gmail.com> -Date: Wed, 6 Jan 2021 13:33:33 +0100 -Subject: [PATCH] Make code.FormattedExcinfo.get_source more defensive - -When line_index was a large negative number, get_source failed -on `source.lines[line_index]`. -Use the same dummy Source as with a large positive line_index. ---- - src/_pytest/_code/code.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/_pytest/_code/code.py b/src/_pytest/_code/code.py -index b85217560..af3bdf056 100644 ---- a/src/_pytest/_code/code.py -+++ b/src/_pytest/_code/code.py -@@ -721,11 +721,11 @@ class FormattedExcinfo: - ) -> List[str]: - """Return formatted and marked up source lines.""" - lines = [] -- if source is None or line_index >= len(source.lines): -+ if source is not None and line_index < 0: -+ line_index += len(source.lines) -+ if source is None or line_index >= len(source.lines) or line_index < 0: - source = Source("???") - line_index = 0 -- if line_index < 0: -- line_index += len(source) - space_prefix = " " - if short: - lines.append(space_prefix + source.lines[line_index].strip()) --- -2.31.1 - diff --git a/dev-python/pytest/pytest-6.1.2.ebuild b/dev-python/pytest/pytest-6.1.2.ebuild deleted file mode 100644 index 21b4753e5aa4..000000000000 --- a/dev-python/pytest/pytest-6.1.2.ebuild +++ /dev/null @@ -1,62 +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_{7..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="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" -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/pluggy-1 - >=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}" -} diff --git a/dev-python/pytest/pytest-6.2.4-r1.ebuild b/dev-python/pytest/pytest-6.2.4-r1.ebuild deleted file mode 100644 index ac093bcc4d5a..000000000000 --- a/dev-python/pytest/pytest-6.2.4-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} 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 ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/importlib_metadata[${PYTHON_USEDEP}] - ' python3_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/pluggy-1 - >=dev-python/py-1.8.2[${PYTHON_USEDEP}] - dev-python/toml[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - $(python_gen_cond_dep ' - 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}] - ' python3_{7..9} pypy3) - )" - -PATCHES=( - "${FILESDIR}"/${P}-py310.patch -) - -src_test() { - # workaround new readline defaults - echo "set enable-bracketed-paste off" > "${T}"/inputrc || die - local -x INPUTRC="${T}"/inputrc - distutils-r1_src_test -} - -python_test() { - [[ ${EPYTHON} == python3.10 ]] && return - - distutils_install_for_testing --via-root - - "${EPYTHON}" -m pytest -vv --lsof -rfsxX -p no:pkgcore -p no:flaky || - die "Tests failed with ${EPYTHON}" -} diff --git a/dev-python/pytest/pytest-6.2.5.ebuild b/dev-python/pytest/pytest-6.2.5.ebuild index 4cace9f6b7e0..9894800b747d 100644 --- a/dev-python/pytest/pytest-6.2.5.ebuild +++ b/dev-python/pytest/pytest-6.2.5.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" IUSE="test" RESTRICT="!test? ( test )" |