summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-09-20 17:18:02 +0200
committerMichał Górny <mgorny@gentoo.org>2020-09-20 17:37:40 +0200
commita486638bcf15a43f6507b864e7ab391f0943d359 (patch)
tree08ba68e247d3c93c0bb4adfd40b8e5291af64dc8 /dev-python/pbr
parentdev-python/testscenarios: Remove python2 (diff)
downloadgentoo-a486638bcf15a43f6507b864e7ab391f0943d359.tar.gz
gentoo-a486638bcf15a43f6507b864e7ab391f0943d359.tar.bz2
gentoo-a486638bcf15a43f6507b864e7ab391f0943d359.zip
dev-python/pbr: Remove python2
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-python/pbr')
-rw-r--r--dev-python/pbr/pbr-5.4.5-r1.ebuild (renamed from dev-python/pbr/pbr-5.4.5.ebuild)32
-rw-r--r--dev-python/pbr/pbr-5.5.0-r1.ebuild (renamed from dev-python/pbr/pbr-5.5.0.ebuild)32
2 files changed, 24 insertions, 40 deletions
diff --git a/dev-python/pbr/pbr-5.4.5.ebuild b/dev-python/pbr/pbr-5.4.5-r1.ebuild
index 36454f258a7f..b9f96cb30731 100644
--- a/dev-python/pbr/pbr-5.4.5.ebuild
+++ b/dev-python/pbr/pbr-5.4.5-r1.ebuild
@@ -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}
diff --git a/dev-python/pbr/pbr-5.5.0.ebuild b/dev-python/pbr/pbr-5.5.0-r1.ebuild
index a738c43b0daf..7e7e611dcad7 100644
--- a/dev-python/pbr/pbr-5.5.0.ebuild
+++ b/dev-python/pbr/pbr-5.5.0-r1.ebuild
@@ -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}