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 853D7138351 for ; Sat, 28 Mar 2020 13:34:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 572DEE0DC8; Sat, 28 Mar 2020 13:34:12 +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 1D071E0DC8 for ; Sat, 28 Mar 2020 13:34:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 ED7D234F920 for ; Sat, 28 Mar 2020 13:34:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A05B195 for ; Sat, 28 Mar 2020 13:34:09 +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: <1585402436.de457e9a786c65db2f9a1a1845640d48b5aca36d.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pbr/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pbr/pbr-3.1.1.ebuild dev-python/pbr/pbr-4.1.1.ebuild dev-python/pbr/pbr-4.2.0-r1.ebuild dev-python/pbr/pbr-4.2.0-r2.ebuild dev-python/pbr/pbr-5.1.1.ebuild X-VCS-Directories: dev-python/pbr/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: de457e9a786c65db2f9a1a1845640d48b5aca36d X-VCS-Branch: master Date: Sat, 28 Mar 2020 13:34:09 +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: 549e8345-8ea5-48cc-a29f-a5910ec3ffc1 X-Archives-Hash: 005582a31c7f472a087b9794a229cf77 commit: de457e9a786c65db2f9a1a1845640d48b5aca36d Author: Michał Górny gentoo org> AuthorDate: Sat Mar 28 13:27:45 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Mar 28 13:33:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de457e9a dev-python/pbr: Disable tests on py2 to unblock deps Signed-off-by: Michał Górny gentoo.org> dev-python/pbr/pbr-3.1.1.ebuild | 40 ++++++++++++++++++++-------------- dev-python/pbr/pbr-4.1.1.ebuild | 34 ++++++++++++++++++----------- dev-python/pbr/pbr-4.2.0-r1.ebuild | 36 +++++++++++++++++++------------ dev-python/pbr/pbr-4.2.0-r2.ebuild | 38 +++++++++++++++++++------------- dev-python/pbr/pbr-5.1.1.ebuild | 44 ++++++++++++++++++++++---------------- 5 files changed, 116 insertions(+), 76 deletions(-) diff --git a/dev-python/pbr/pbr-3.1.1.ebuild b/dev-python/pbr/pbr-3.1.1.ebuild index 4b1b8e9ce05..f85a5f633ca 100644 --- a/dev-python/pbr/pbr-3.1.1.ebuild +++ b/dev-python/pbr/pbr-3.1.1.ebuild @@ -24,22 +24,24 @@ RESTRICT="!test? ( test )" DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] test? ( - >=dev-python/coverage-4.0[${PYTHON_USEDEP}] - !~dev-python/coverage-4.4[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.5.1[$(python_gen_usedep 'python2_7' 'python3_6')] - !~dev-python/sphinx-1.6.1[$(python_gen_usedep 'python2_7' 'python3_6')] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - >=dev-python/virtualenv-13.1.0[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-vcs/git + $(python_gen_cond_dep ' + >=dev-python/coverage-4.0[${PYTHON_USEDEP}] + !~dev-python/coverage-4.4[${PYTHON_USEDEP}] + >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] + >=dev-python/sphinx-1.5.1[${PYTHON_USEDEP}] + !~dev-python/sphinx-1.6.1[${PYTHON_USEDEP}] + >=dev-python/six-1.9.0[${PYTHON_USEDEP}] + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] + >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}] + >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] + >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] + >=dev-python/virtualenv-13.1.0[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-vcs/git + ' -3) )" PDEPEND="" @@ -65,6 +67,12 @@ python_prepare_all() { } python_test() { + if ! python_is_python3; then + ewarn "Skipping tests on ${EPYTHON} to unblock circular deps." + ewarn "Please run tests manually." + return + fi + distutils_install_for_testing rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}" diff --git a/dev-python/pbr/pbr-4.1.1.ebuild b/dev-python/pbr/pbr-4.1.1.ebuild index 1f13d6c70ec..f9fbfd117e8 100644 --- a/dev-python/pbr/pbr-4.1.1.ebuild +++ b/dev-python/pbr/pbr-4.1.1.ebuild @@ -24,19 +24,21 @@ RESTRICT="!test? ( test )" DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] test? ( - >=dev-python/coverage-4.0[${PYTHON_USEDEP}] - !~dev-python/coverage-4.4[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/subunit-1.0.0[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testresources-2.0.0[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] - >=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - dev-vcs/git + $(python_gen_cond_dep ' + >=dev-python/coverage-4.0[${PYTHON_USEDEP}] + !~dev-python/coverage-4.4[${PYTHON_USEDEP}] + >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/subunit-1.0.0[${PYTHON_USEDEP}] + >=dev-python/six-1.10.0[${PYTHON_USEDEP}] + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] + >=dev-python/testresources-2.0.0[${PYTHON_USEDEP}] + >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] + >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] + >=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + dev-vcs/git + ' -3) )" PDEPEND="" @@ -62,6 +64,12 @@ python_prepare_all() { } python_test() { + if ! python_is_python3; then + ewarn "Skipping tests on ${EPYTHON} to unblock circular deps." + ewarn "Please run tests manually." + return + fi + distutils_install_for_testing rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}" diff --git a/dev-python/pbr/pbr-4.2.0-r1.ebuild b/dev-python/pbr/pbr-4.2.0-r1.ebuild index d63fe1d35c9..79874ed5d67 100644 --- a/dev-python/pbr/pbr-4.2.0-r1.ebuild +++ b/dev-python/pbr/pbr-4.2.0-r1.ebuild @@ -26,20 +26,22 @@ RESTRICT="!test? ( test )" DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] test? ( - >=dev-python/coverage-4.0[${PYTHON_USEDEP}] - !~dev-python/coverage-4.4[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/subunit-1.0.0[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testresources-2.0.0[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] - >=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - >=dev-python/stestr-2.1.0 - dev-vcs/git + $(python_gen_cond_dep ' + >=dev-python/coverage-4.0[${PYTHON_USEDEP}] + !~dev-python/coverage-4.4[${PYTHON_USEDEP}] + >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/subunit-1.0.0[${PYTHON_USEDEP}] + >=dev-python/six-1.10.0[${PYTHON_USEDEP}] + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] + >=dev-python/testresources-2.0.0[${PYTHON_USEDEP}] + >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] + >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] + >=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + >=dev-python/stestr-2.1.0 + dev-vcs/git + ' -3) )" PDEPEND="" @@ -65,6 +67,12 @@ python_prepare_all() { } python_test() { + if ! python_is_python3; then + ewarn "Skipping tests on ${EPYTHON} to unblock circular deps." + ewarn "Please run tests manually." + return + fi + distutils_install_for_testing rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}" diff --git a/dev-python/pbr/pbr-4.2.0-r2.ebuild b/dev-python/pbr/pbr-4.2.0-r2.ebuild index 55e10b83667..94ff80c61fe 100644 --- a/dev-python/pbr/pbr-4.2.0-r2.ebuild +++ b/dev-python/pbr/pbr-4.2.0-r2.ebuild @@ -26,21 +26,23 @@ RESTRICT="!test? ( test )" DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] test? ( - >=dev-python/coverage-4.0[${PYTHON_USEDEP}] - !~dev-python/coverage-4.4[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/subunit-1.0.0[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testresources-2.0.0[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] - >=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - >=dev-python/stestr-2.1.0 - dev-vcs/git + $(python_gen_cond_dep ' + >=dev-python/coverage-4.0[${PYTHON_USEDEP}] + !~dev-python/coverage-4.4[${PYTHON_USEDEP}] + >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/subunit-1.0.0[${PYTHON_USEDEP}] + >=dev-python/six-1.10.0[${PYTHON_USEDEP}] + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] + >=dev-python/testresources-2.0.0[${PYTHON_USEDEP}] + >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] + >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] + >=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + >=dev-python/stestr-2.1.0 + dev-vcs/git + ' -3) )" PDEPEND="" @@ -66,6 +68,12 @@ python_prepare_all() { } python_test() { + if ! python_is_python3; then + ewarn "Skipping tests on ${EPYTHON} to unblock circular deps." + ewarn "Please run tests manually." + return + fi + distutils_install_for_testing rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}" diff --git a/dev-python/pbr/pbr-5.1.1.ebuild b/dev-python/pbr/pbr-5.1.1.ebuild index 8b1069e5b66..d7ca22efae7 100644 --- a/dev-python/pbr/pbr-5.1.1.ebuild +++ b/dev-python/pbr/pbr-5.1.1.ebuild @@ -26,24 +26,26 @@ RESTRICT="!test? ( test )" DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] test? ( - >=dev-python/wheel-0.32.0[${PYTHON_USEDEP}] - >=dev-python/coverage-4.0[${PYTHON_USEDEP}] - !~dev-python/coverage-4.4[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/subunit-1.0.0[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testresources-2.0.0[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] - >=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}] - >=dev-python/coverage-4.0[${PYTHON_USEDEP}] - !~dev-python/coverage-4.4[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - >=dev-python/stestr-2.1.0 - dev-vcs/git + $(python_gen_cond_dep ' + >=dev-python/wheel-0.32.0[${PYTHON_USEDEP}] + >=dev-python/coverage-4.0[${PYTHON_USEDEP}] + !~dev-python/coverage-4.4[${PYTHON_USEDEP}] + >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/subunit-1.0.0[${PYTHON_USEDEP}] + >=dev-python/six-1.10.0[${PYTHON_USEDEP}] + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] + >=dev-python/testresources-2.0.0[${PYTHON_USEDEP}] + >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] + >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] + >=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}] + >=dev-python/coverage-4.0[${PYTHON_USEDEP}] + !~dev-python/coverage-4.4[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + >=dev-python/stestr-2.1.0 + dev-vcs/git + ' -3) )" PDEPEND="" @@ -69,6 +71,12 @@ python_prepare_all() { } python_test() { + if ! python_is_python3; then + ewarn "Skipping tests on ${EPYTHON} to unblock circular deps." + ewarn "Please run tests manually." + return + fi + distutils_install_for_testing rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"