dev-python/pbr: Remove python2

Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
2020-09-20 17:18:02 +02:00
parent 11649284f7
commit a486638bcf
2 changed files with 24 additions and 40 deletions

View File

@@ -3,7 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
PYTHON_COMPAT=( python3_{6..9} pypy3 )
PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
@@ -25,19 +25,17 @@ RESTRICT="!test? ( test )"
# stestr is run as external tool
BDEPEND="
test? (
$(python_gen_cond_dep '
>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
dev-python/sphinx[${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-20[${PYTHON_USEDEP}]
>=dev-python/stestr-2.1.0
dev-vcs/git
' -3)
>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
dev-python/sphinx[${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-20[${PYTHON_USEDEP}]
>=dev-python/stestr-2.1.0
dev-vcs/git
)"
PDEPEND=""
@@ -57,12 +55,6 @@ 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
local -x PATH=${TEST_DIR}/scripts:${PATH}

View File

@@ -4,7 +4,7 @@
EAPI=7
DISTUTILS_USE_SETUPTOOLS=rdepend
PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
PYTHON_COMPAT=( python3_{6..9} pypy3 )
PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
@@ -24,19 +24,17 @@ RESTRICT="!test? ( test )"
# stestr is run as external tool
BDEPEND="
test? (
$(python_gen_cond_dep '
>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
dev-python/sphinx[${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-20.0.3[${PYTHON_USEDEP}]
>=dev-python/stestr-2.1.0
dev-vcs/git
' -3)
>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
dev-python/sphinx[${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-20.0.3[${PYTHON_USEDEP}]
>=dev-python/stestr-2.1.0
dev-vcs/git
)"
PDEPEND=""
@@ -56,12 +54,6 @@ 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
local -x PATH=${TEST_DIR}/scripts:${PATH}