From de457e9a786c65db2f9a1a1845640d48b5aca36d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 28 Mar 2020 14:27:45 +0100 Subject: [PATCH] dev-python/pbr: Disable tests on py2 to unblock deps MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- 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 4b1b8e9ce05f..f85a5f633ca9 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 1f13d6c70ecd..f9fbfd117e8e 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 d63fe1d35c98..79874ed5d679 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 55e10b83667f..94ff80c61fe1 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 8b1069e5b667..d7ca22efae7e 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}" -- 2.26.2