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 3D08F138359 for ; Sun, 12 Jul 2020 20:19:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D09DE081B; Sun, 12 Jul 2020 20:19:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 04C49E0817 for ; Sun, 12 Jul 2020 20:19:54 +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 BAEA634FC45 for ; Sun, 12 Jul 2020 20:19:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A604D2D7 for ; Sun, 12 Jul 2020 20:19:51 +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: <1594585184.c8450538b10b235ace13d324021308dbf5ad9604.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/setuptools/setuptools-44.1.0.ebuild dev-python/setuptools/setuptools-46.4.0-r1.ebuild X-VCS-Directories: dev-python/setuptools/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c8450538b10b235ace13d324021308dbf5ad9604 X-VCS-Branch: master Date: Sun, 12 Jul 2020 20:19:51 +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: ed5c4a65-4722-48fb-b0b2-db1af0cdf873 X-Archives-Hash: 1c3619b3e20a41d97e00f23c2374a884 commit: c8450538b10b235ace13d324021308dbf5ad9604 Author: Michał Górny gentoo org> AuthorDate: Sun Jul 12 19:39:42 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Jul 12 20:19:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8450538 dev-python/setuptools: Disable tests on py2 Signed-off-by: Michał Górny gentoo.org> dev-python/setuptools/setuptools-44.1.0.ebuild | 20 ++++++++++++-------- dev-python/setuptools/setuptools-46.4.0-r1.ebuild | 20 ++++++++++++-------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dev-python/setuptools/setuptools-44.1.0.ebuild b/dev-python/setuptools/setuptools-44.1.0.ebuild index 56fd5bdf49f..9e87131b2a1 100644 --- a/dev-python/setuptools/setuptools-44.1.0.ebuild +++ b/dev-python/setuptools/setuptools-44.1.0.ebuild @@ -27,15 +27,14 @@ RESTRICT="!test? ( test )" BDEPEND=" app-arch/unzip test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}] - dev-python/pytest-fixture-config[${PYTHON_USEDEP}] - dev-python/pytest-virtualenv[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] $(python_gen_cond_dep ' - dev-python/futures[${PYTHON_USEDEP}] - ' -2) + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}] + dev-python/pytest-fixture-config[${PYTHON_USEDEP}] + dev-python/pytest-virtualenv[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + ' -3) ) " PDEPEND=" @@ -68,6 +67,11 @@ python_prepare_all() { } python_test() { + if ! python_is_python3; then + einfo "Tests are skipped on py2 to untangle deps" + return + fi + # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg # It tries to sandbox the test in a tempdir HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}" diff --git a/dev-python/setuptools/setuptools-46.4.0-r1.ebuild b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild index c78752db8a1..84c903df0f5 100644 --- a/dev-python/setuptools/setuptools-46.4.0-r1.ebuild +++ b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild @@ -21,15 +21,14 @@ RESTRICT="!test? ( test )" BDEPEND=" app-arch/unzip test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}] - dev-python/pytest-fixture-config[${PYTHON_USEDEP}] - dev-python/pytest-virtualenv[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] $(python_gen_cond_dep ' - dev-python/futures[${PYTHON_USEDEP}] - ' -2) + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}] + dev-python/pytest-fixture-config[${PYTHON_USEDEP}] + dev-python/pytest-virtualenv[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + ' -3) ) " PDEPEND=" @@ -63,6 +62,11 @@ python_prepare_all() { } python_test() { + if ! python_is_python3; then + einfo "Tests are skipped on py2 to untangle deps" + return + fi + distutils_install_for_testing # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg # It tries to sandbox the test in a tempdir