bump pytest-4.6.3 & -5.0.0

This commit is contained in:
2019-07-01 18:08:17 +02:00
parent 6369979d40
commit 969181c33a
5 changed files with 64 additions and 101 deletions

View File

@@ -1,8 +1,7 @@
AUX pytest-3.4.2-pypy-syntaxerror-offset.patch 996 BLAKE2B ff6d362d20f6432f73956e1aee4c2bc596e3d8e3347da3624dfd3cbfdd1eabd8872058737e8f9b558f3570878756c7b87a65514956b1e81235c2727e8ff2fc63 SHA512 4a28ddc07389aac79e46528e85229aba126a89c27b7bec73b406766be49f5c8be9bdc2cb3158bfb475b4d6371e2f33960e1ed154e3b9eda15aeb8b151f3d2148
DIST pytest-4.1.0.tar.gz 902235 BLAKE2B 6289d13f6d81130fe4a1ea25dbe93c76206cd61c11e3c18bb5febd92539f37f45144565680a6df097667a5e940e545e7973193abd214bff7b9287d9b42b00e56 SHA512 30cbefa066728b72063b21190df74b7cbf56d045e87307915af45e3ff5cdbb76c79dd0c2428425c2db9f8f0ba99a116d787526dc806801787b89a7862dd9e56e
DIST pytest-4.1.1.tar.gz 903912 BLAKE2B 6466f8620ddf509ad17c9fddd8d9afd8cd53b67673bf12c603a563daa30decd6ca067ec829bece49505650536c02854493ed27d5dd350f2bd5cbd4c71c85721a SHA512 e93b742b61fdba7518d833bdc312282347853abb1fe76920f14e791ede2af57513b521b967303483dfc2e308ec83c9c9e1f8d81489ee5610808e3b33b42b8452
DIST pytest-4.2.1.tar.gz 913065 BLAKE2B cde085627872d601df1c6d91d9620fbb97789b6e176fe104bc991faa800268e5e61651e211a8840743b21f8cd9b57dcee8685143e2f4d56d197afae35a577aed SHA512 e41bf7c685cacd62261df6d356911297a65ba85e13a50f8aed23d382d257c4c1cd3213971a3970fec210b8e97b72bd0034c0c1f87be7f306286d541c5ea57097
EBUILD pytest-4.1.0.ebuild 2190 BLAKE2B 11afe662abfeccadfb9ed37678095c6e41939af9800cc07c736b256c062c71479469e35675d1c3ffb31f4b274159a7f769d22ea72f9fbbc44c3f5bd27dfb1849 SHA512 e8acb146b426f456540f6d0c33b552f19544677542e980af5a9647cc837466e8ec295c233da1cdb447e441ccef4e077cf048cd567418b4bd0cbf428956d0c81b
EBUILD pytest-4.1.1.ebuild 2175 BLAKE2B fe4d8d0df653d10e762c05607a09e2c9a5a2d327377e9cc25bee39e934427286f7598c61796d392c9a2824da2ac9faffe04f404aa3260152ef8c8141816ed685 SHA512 59e06ace5b93cceccaa74454f773e3d8b15cd0cb014e8bdea8d95e1d3fdeeefce104acf8b00f624c7da1cdf349fff7622d6b3f1b2ec8608413bafabdc8f0db6d
EBUILD pytest-4.2.1.ebuild 2175 BLAKE2B fe4d8d0df653d10e762c05607a09e2c9a5a2d327377e9cc25bee39e934427286f7598c61796d392c9a2824da2ac9faffe04f404aa3260152ef8c8141816ed685 SHA512 59e06ace5b93cceccaa74454f773e3d8b15cd0cb014e8bdea8d95e1d3fdeeefce104acf8b00f624c7da1cdf349fff7622d6b3f1b2ec8608413bafabdc8f0db6d
AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a0124dc4f35892b18ecbcce34280a00774012822fced0045ac7113a50f8f88d042b88e404dbf4d8d3760140c66a48daa3da2a44c6 SHA512 d34d7c1db57804f0d1ff71f3f51c9a736592945fdf564f54c0c20c398c86f08616eb21f75d77457a71738df4d254ec3d69e46aa3378dea6f7913933bcdf45c08
DIST pytest-4.6.3.tar.gz 949947 BLAKE2B abdf7eb69e3a2b32275174682cf80211f4875003f0a4384a0a50e4ae27966b5f032ac9d6f5a99a134267dbcbe7f2c63108e960e0bb369596ada599673d31b391 SHA512 db6e26b3b3cd34a8d116536a6897bf2037f099ad935e201e6824221ac108bc66e936bccaf17bfe7880675ccea1d3704f77eab006c86d8f7357bbe9a943ebddef
DIST pytest-5.0.0.tar.gz 947536 BLAKE2B d52f9f87f57f777891be892784d2c259418fb8df9a33e4742b2bf0c6067ab5766dc67c1acfd957337babe01e3bde52e8163a32724ade23a829fa7e12c0d6f467 SHA512 e9538035076c55ffaded4eebd0aba0032e75dd18974c67a09899d0d22a5ab3d784f46de760633a6b06e749ff3a7a68db9fe35780327ab62d23b5902e2e488694
EBUILD pytest-4.6.3.ebuild 2054 BLAKE2B 4421866033a8df11789934608511a116c06faa5aa1a2e50f450e4f13882657f65b5ad00ab4e3903da2bdbdc03a5852f668df16d68993aa85cbe68a83f3edfe97 SHA512 334e9e67905b4a5c934f4f43fd38b555547583a3321f95e51c4046e03f22b00052fa958d8e6360af437937ceccbd672fb7b8a337ed3bcfc4668065a2f132ff84
EBUILD pytest-5.0.0.ebuild 2054 BLAKE2B 4421866033a8df11789934608511a116c06faa5aa1a2e50f450e4f13882657f65b5ad00ab4e3903da2bdbdc03a5852f668df16d68993aa85cbe68a83f3edfe97 SHA512 334e9e67905b4a5c934f4f43fd38b555547583a3321f95e51c4046e03f22b00052fa958d8e6360af437937ceccbd672fb7b8a337ed3bcfc4668065a2f132ff84
MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f

View File

@@ -0,0 +1,25 @@
diff --git a/setup.py b/setup.py
index 0fb5a58a..302b5dda 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,5 @@
from setuptools import setup
+import os
# TODO: if py gets upgrade to >=1.6,
# remove _width_of_current_line in terminal.py
@@ -18,10 +19,12 @@ INSTALL_REQUIRES = [
]
+with open("src/_pytest/_version.py", 'wt') as fp:
+ fp.write('version = "{}"'.format(os.environ['PV']))
+
def main():
setup(
- use_scm_version={"write_to": "src/_pytest/_version.py"},
- setup_requires=["setuptools-scm", "setuptools>=40.0"],
+ version=os.environ['PV'],
package_dir={"": "src"},
# fmt: off
extras_require={

View File

@@ -1,65 +0,0 @@
# Copyright 1999-2019 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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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[${PYTHON_USEDEP}]' python2_7 python3_{4,5} )
>=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}]"
# 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/nose[${PYTHON_USEDEP}]
$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
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}"
}

View File

@@ -3,7 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
inherit distutils-r1
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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
@@ -25,25 +25,29 @@ 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}]
$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_5 )
>=dev-python/pluggy-0.11[${PYTHON_USEDEP}]
<dev-python/pluggy-1
>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
>=dev-python/setuptools-40[${PYTHON_USEDEP}]
>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
dev-python/wcwidth[${PYTHON_USEDEP}]
virtual/python-funcsigs[${PYTHON_USEDEP}]"
# flake & pytest-capturelog cause a number of tests to fail
# flake 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/nose[${PYTHON_USEDEP}]
$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
dev-python/requests[${PYTHON_USEDEP}]
!!dev-python/flaky
!!dev-python/pytest-capturelog
)"
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"
@@ -51,15 +55,13 @@ python_prepare_all() {
# 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}"
# 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}"
}

View File

@@ -3,7 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
inherit distutils-r1
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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
@@ -25,25 +25,29 @@ 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}]
$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_5 )
>=dev-python/pluggy-0.11[${PYTHON_USEDEP}]
<dev-python/pluggy-1
>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
>=dev-python/setuptools-40[${PYTHON_USEDEP}]
>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
dev-python/wcwidth[${PYTHON_USEDEP}]
virtual/python-funcsigs[${PYTHON_USEDEP}]"
# flake & pytest-capturelog cause a number of tests to fail
# flake 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/nose[${PYTHON_USEDEP}]
$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
dev-python/requests[${PYTHON_USEDEP}]
!!dev-python/flaky
!!dev-python/pytest-capturelog
)"
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"
@@ -51,15 +55,13 @@ python_prepare_all() {
# 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}"
# 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}"
}