dev-python/pbr: Disable tests on py2 to unblock deps

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/dev-python/pbr/pbr-3.1.1.ebuild b/dev-python/pbr/pbr-3.1.1.ebuild
index 4b1b8e9ce05feea89604c2b7e930b7c90e83c555..f85a5f633ca926027783783063e8497d2545b96e 100644 (file)
--- 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 1f13d6c70ecdd41265a8e4521d665ef36adac93a..f9fbfd117e8e3473facf6c3c28f9b31d57e1c441 100644 (file)
--- 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 d63fe1d35c986a3f8bef9698f4c8842ef9cb9c32..79874ed5d6793fcd09ac44a9262a9b05975a7e75 100644 (file)
--- 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 55e10b83667f867755f69d7728b371fa67e2a3fe..94ff80c61fe100452942c46e61accc653a01bccb 100644 (file)
--- 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 8b1069e5b667fe4078b0dd373617642a14b5a4b2..d7ca22efae7e49cad99ab3c3b9d2d12ac6a1a46b 100644 (file)
--- 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}"