From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DA2ED1382C5 for ; Wed, 27 May 2020 06:11:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC1D5E098A; Wed, 27 May 2020 06:11:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 93314E098A for ; Wed, 27 May 2020 06:11:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4510734E8E7 for ; Wed, 27 May 2020 06:11:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9DF5526D for ; Wed, 27 May 2020 06:10:59 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1590559848.0ca3926ff0f619130ee0b80c12d440b97cd5f70e.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/betamax/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/betamax/betamax-0.8.1.ebuild X-VCS-Directories: dev-python/betamax/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0ca3926ff0f619130ee0b80c12d440b97cd5f70e X-VCS-Branch: master Date: Wed, 27 May 2020 06:10:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b105b1c4-b17b-48cc-8473-4d4ed5681032 X-Archives-Hash: 23649fd47281dcdfa962bf361245acad commit: 0ca3926ff0f619130ee0b80c12d440b97cd5f70e Author: Michał Górny gentoo org> AuthorDate: Wed May 27 05:43:06 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed May 27 06:10:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ca3926f dev-python/betamax: Port to py39, fix tests Signed-off-by: Michał Górny gentoo.org> dev-python/betamax/betamax-0.8.1.ebuild | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild index 4bdaeeb0128..d4fd29f0af6 100644 --- a/dev-python/betamax/betamax-0.8.1.ebuild +++ b/dev-python/betamax/betamax-0.8.1.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 ) +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 ) inherit distutils-r1 @@ -16,17 +17,28 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc x86" IUSE="test" RDEPEND="dev-python/requests[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] +DEPEND=" test? ( + ${RDEPEND} $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) )" -# Tests require Internet access -RESTRICT=test - PATCHES=( "${FILESDIR}/betamax-0.8.1-tests.patch" ) distutils_enable_tests pytest + +src_prepare() { + rm tests/integration/test_hooks.py || die + rm tests/integration/test_placeholders.py || die + sed -e 's:test_records:_&:' \ + -e 's:test_replaces:_&:' \ + -e 's:test_replays:_&:' \ + -e 's:test_creates:_&:' \ + -i tests/integration/test_record_modes.py || die + rm tests/integration/test_unicode.py || die + rm tests/regression/test_gzip_compression.py || die + rm tests/regression/test_requests_2_11_body_matcher.py || die + distutils-r1_src_prepare +}