From 42fb4d8d983aefdcf5e24b0bd0eab86c76a9a7cd Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Wed, 9 Jan 2019 20:15:27 -0500 Subject: dev-python/pytest: remove old Signed-off-by: Virgil Dupras Package-Manager: Portage-2.3.51, Repoman-2.3.11 --- dev-python/pytest/Manifest | 2 - .../pytest-3.6.3-pypy-syntaxerror-offset.patch | 29 -------- dev-python/pytest/pytest-3.6.3.ebuild | 85 ---------------------- dev-python/pytest/pytest-3.8.2.ebuild | 81 --------------------- 4 files changed, 197 deletions(-) delete mode 100644 dev-python/pytest/files/pytest-3.6.3-pypy-syntaxerror-offset.patch delete mode 100644 dev-python/pytest/pytest-3.6.3.ebuild delete mode 100644 dev-python/pytest/pytest-3.8.2.ebuild (limited to 'dev-python/pytest') diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest index 428fcb9cfd3c..281c5eb28839 100644 --- a/dev-python/pytest/Manifest +++ b/dev-python/pytest/Manifest @@ -1,6 +1,4 @@ DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862010f700f9a8cb85f445910381af391a5b69e664fbbfc254bf46502c798c72026772070236a0a3bca7aeeb3d6 SHA512 787065ab76d4482799bb2da9f024c9c383e68cc1cc01f3b80f6ed9444ca6383d20953615696ed4dd01668777b094cf5002b23c4ce51828879dcf8ebf2170c71b -DIST pytest-3.6.3.tar.gz 830949 BLAKE2B 4c0df5d157b8bb0ac6261a793aac2a8074c869b1a7cbda3eda600c79648b3722eaf2a57514c1fece60e0aac324b8ed09e8e889dda268619204e9e1f1637e1c9b SHA512 e18d8e972cb1b05b037b9441eea5981ce036d8e2c2bab80f6e50f283df9bd08740296133990424cf78449f6d3d2fbd1d59709770aa972af99fe061583f2d79a7 -DIST pytest-3.8.2.tar.gz 869668 BLAKE2B 91d75481e4ef36ab06654b340751a33a96b9f6187cdfc65694973e2d4d7ddc5806fe673c87f0aa442c6c657a953b36c22d288eee8f61cc002be4be803bc98111 SHA512 5420de07ff741f64bcb7fce7bf3b5097cf63be2539c2e694c168bd824ba468ca87cb17be801b72b972ab417da98d1b5473f319afd642bf5c6c0270e3a697d016 DIST pytest-4.1.0.tar.gz 902235 BLAKE2B 6289d13f6d81130fe4a1ea25dbe93c76206cd61c11e3c18bb5febd92539f37f45144565680a6df097667a5e940e545e7973193abd214bff7b9287d9b42b00e56 SHA512 30cbefa066728b72063b21190df74b7cbf56d045e87307915af45e3ff5cdbb76c79dd0c2428425c2db9f8f0ba99a116d787526dc806801787b89a7862dd9e56e diff --git a/dev-python/pytest/files/pytest-3.6.3-pypy-syntaxerror-offset.patch b/dev-python/pytest/files/pytest-3.6.3-pypy-syntaxerror-offset.patch deleted file mode 100644 index 31dd00546761..000000000000 --- a/dev-python/pytest/files/pytest-3.6.3-pypy-syntaxerror-offset.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://salsa.debian.org/python-team/modules/pytest/commit/405c05a0827592515de76e23c94de1f7773273e6.patch - -(updated by mgorny for 3.6.3 -- upstream quoting changes) - -From 405c05a0827592515de76e23c94de1f7773273e6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= -Date: Thu, 10 May 2018 11:42:56 +0200 -Subject: [PATCH] Fix PyPy SyntaxError offset in tests - ---- - testing/code/test_source.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testing/code/test_source.py b/testing/code/test_source.py -index fcce3fa..22278d8 100644 ---- a/testing/code/test_source.py -+++ b/testing/code/test_source.py -@@ -117,7 +117,7 @@ def test_source_strip_multiline(): - def test_syntaxerror_rerepresentation(): - ex = pytest.raises(SyntaxError, _pytest._code.compile, "xyz xyz") - assert ex.value.lineno == 1 -- assert ex.value.offset in (4, 7) # XXX pypy/jython versus cpython? -+ assert ex.value.offset in (4, 5, 7) # XXX pypy/jython versus cpython? - assert ex.value.text.strip(), "x x" - - --- -2.18.0 - diff --git a/dev-python/pytest/pytest-3.6.3.ebuild b/dev-python/pytest/pytest-3.6.3.ebuild deleted file mode 100644 index 24cb5009b0b1..000000000000 --- a/dev-python/pytest/pytest-3.6.3.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} ) - -inherit distutils-r1 - -DESCRIPTION="Simple powerful testing with Python" -HOMEPAGE="http://pytest.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-fbsd" -# doc apparently requires sphinxcontrib_trio, not yet packaged -IUSE="test" # doc - -# When bumping, please check setup.py for the proper py version -PY_VER="1.5.0" -COMMON_DEPEND=" - >=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}] - >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}] - >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] - >=dev-python/pluggy-0.5[${PYTHON_USEDEP}] - >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - virtual/python-funcsigs[${PYTHON_USEDEP}]" - -# doc? ( -# dev-python/pyyaml[${PYTHON_USEDEP}] -# dev-python/sphinx[${PYTHON_USEDEP}] -# )" - -# flake & pytest-capturelog cause a number of tests to fail -DEPEND="${COMMON_DEPEND} - dev-python/setuptools_scm[${PYTHON_USEDEP}] - test? ( - >=dev-python/hypothesis-3.5.2[${PYTHON_USEDEP}] - >=dev-python/pytest-xdist-1.22.2[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - !!dev-python/flaky - !!dev-python/pytest-capturelog - )" - -RDEPEND=" - ${COMMON_DEPEND} - !=${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 - - # those tests appear to hang with python3.5+; TODO: investigate why - sed -i -e 's:test_runtest_location_shown_before_test_starts:_&:' \ - testing/test_terminal.py || die - sed -i -e 's:test_trial_pdb:_&:' testing/test_unittest.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \ - -vv testing || die "tests failed with ${EPYTHON}" -} - -#python_compile_all() { -# use doc && emake -C doc/en html -#} -# -#python_install_all() { -# use doc && HTML_DOCS=( doc/en/_build/html/. ) -# distutils-r1_python_install_all -#} diff --git a/dev-python/pytest/pytest-3.8.2.ebuild b/dev-python/pytest/pytest-3.8.2.ebuild deleted file mode 100644 index dca19e60080c..000000000000 --- a/dev-python/pytest/pytest-3.8.2.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} ) - -inherit distutils-r1 - -DESCRIPTION="Simple powerful testing with Python" -HOMEPAGE="http://pytest.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -# doc apparently requires sphinxcontrib_trio, not yet packaged -IUSE="test" # doc - -# 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[${PYTHON_USEDEP}]' python2_7 python3_{4,5} ) - >=dev-python/pluggy-0.7[${PYTHON_USEDEP}] - >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - virtual/python-funcsigs[${PYTHON_USEDEP}]" - -# doc? ( -# dev-python/pyyaml[${PYTHON_USEDEP}] -# dev-python/sphinx[${PYTHON_USEDEP}] -# )" - -# flake & pytest-capturelog cause a number of tests to fail -DEPEND="${RDEPEND} - dev-python/setuptools_scm[${PYTHON_USEDEP}] - test? ( - >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] - >=dev-python/pytest-xdist-1.22.2[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - !!dev-python/flaky - !!dev-python/pytest-capturelog - )" - -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 - - # those tests appear to hang with python3.5+; TODO: investigate why - sed -i -e 's:test_runtest_location_shown_before_test_starts:_&:' \ - testing/test_terminal.py || die - sed -i -e 's:test_trial_pdb:_&:' testing/test_unittest.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \ - -vv testing || die "tests failed with ${EPYTHON}" -} - -#python_compile_all() { -# use doc && emake -C doc/en html -#} -# -#python_install_all() { -# use doc && HTML_DOCS=( doc/en/_build/html/. ) -# distutils-r1_python_install_all -#} -- cgit v1.2.3-18-g5258