summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2019-04-20 11:30:35 +0200
committerDavid Seifert <soap@gentoo.org>2019-04-20 13:12:08 +0200
commit7ab150c0ab141bef4a8826fbf90e83af25ffdd9b (patch)
tree89e80ebaa72250578b294ea50b5d966a7c6e0e17 /dev-python
parentx11-libs/pango: use HTTPS (diff)
downloadgentoo-7ab150c0ab141bef4a8826fbf90e83af25ffdd9b.tar.gz
gentoo-7ab150c0ab141bef4a8826fbf90e83af25ffdd9b.tar.bz2
gentoo-7ab150c0ab141bef4a8826fbf90e83af25ffdd9b.zip
*/*: Remove last vestiges of python3_4
Closes: https://github.com/gentoo/gentoo/pull/11755 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild3
-rw-r--r--dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild3
-rw-r--r--dev-python/celery/celery-4.1.0.ebuild4
-rw-r--r--dev-python/configshell-fb/configshell-fb-1.1.25.ebuild2
-rw-r--r--dev-python/curtsies/curtsies-0.3.0-r1.ebuild2
-rw-r--r--dev-python/docker-py/docker-py-2.4.2.ebuild2
-rw-r--r--dev-python/docker-py/docker-py-2.7.0.ebuild2
-rw-r--r--dev-python/docker-py/docker-py-3.4.1.ebuild2
-rw-r--r--dev-python/docker-py/docker-py-3.5.0.ebuild2
-rw-r--r--dev-python/docker-py/docker-py-3.5.1.ebuild2
-rw-r--r--dev-python/docker-py/docker-py-3.6.0.ebuild2
-rw-r--r--dev-python/docker-py/docker-py-3.7.0.ebuild2
-rw-r--r--dev-python/docker-py/docker-py-3.7.1.ebuild2
-rw-r--r--dev-python/libcloud/libcloud-1.2.1.ebuild2
-rw-r--r--dev-python/libcloud/libcloud-1.5.0.ebuild2
-rw-r--r--dev-python/libcloud/libcloud-2.3.0.ebuild2
-rw-r--r--dev-python/networkx/networkx-1.11-r1.ebuild2
-rw-r--r--dev-python/networkx/networkx-1.11.ebuild2
-rw-r--r--dev-python/nose/nose-1.3.7-r3.ebuild2
-rw-r--r--dev-python/nose/nose-9999.ebuild2
-rw-r--r--dev-python/pathlib2/pathlib2-2.3.0.ebuild2
-rw-r--r--dev-python/pathlib2/pathlib2-2.3.2.ebuild2
-rw-r--r--dev-python/pbr/pbr-3.1.1.ebuild4
-rw-r--r--dev-python/pbr/pbr-4.2.0-r1.ebuild2
-rw-r--r--dev-python/pbr/pbr-4.2.0-r2.ebuild2
-rw-r--r--dev-python/pbr/pbr-5.1.1.ebuild2
-rw-r--r--dev-python/pytest/pytest-3.10.1.ebuild4
-rw-r--r--dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild16
-rw-r--r--dev-python/twine/twine-1.11.0.ebuild2
29 files changed, 38 insertions, 42 deletions
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild
index f4dba43d46b1..25e033410ba1 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild
@@ -17,8 +17,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
-RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python3_4)"
+RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild
index 4c3301227c0e..2ef943a0aea3 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild
@@ -17,8 +17,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
-RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python3_4)"
+RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
diff --git a/dev-python/celery/celery-4.1.0.ebuild b/dev-python/celery/celery-4.1.0.ebuild
index 7d885d9e5bcd..23aeae4b7304 100644
--- a/dev-python/celery/celery-4.1.0.ebuild
+++ b/dev-python/celery/celery-4.1.0.ebuild
@@ -52,8 +52,8 @@ DEPEND="
>=dev-python/sphinx_celery-1.3[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/sqlalchemy[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python2_7 python3_4)
- )"
+ $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python2_7)
+ )"
# testsuite needs it own source
DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild
index 4fe6f47f5099..c04e53c370b3 100644
--- a/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild
+++ b/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
inherit distutils-r1
DESCRIPTION="A Python library for building configuration shells"
diff --git a/dev-python/curtsies/curtsies-0.3.0-r1.ebuild b/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
index 7b1df83d4c26..d3cffb724a5b 100644
--- a/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
+++ b/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="test"
RDEPEND="
>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
>=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python{2_7,3_4})
+ $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python2_7)
"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/docker-py/docker-py-2.4.2.ebuild b/dev-python/docker-py/docker-py-2.4.2.ebuild
index 64d1256b9eee..4b5d48530b51 100644
--- a/dev-python/docker-py/docker-py-2.4.2.ebuild
+++ b/dev-python/docker-py/docker-py-2.4.2.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
>=dev-python/requests-2.11.1[${PYTHON_USEDEP}]
>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+ $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
"
DEPEND="
diff --git a/dev-python/docker-py/docker-py-2.7.0.ebuild b/dev-python/docker-py/docker-py-2.7.0.ebuild
index 10baf7d30ada..47ecce78b134 100644
--- a/dev-python/docker-py/docker-py-2.7.0.ebuild
+++ b/dev-python/docker-py/docker-py-2.7.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+ $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
"
DEPEND="
diff --git a/dev-python/docker-py/docker-py-3.4.1.ebuild b/dev-python/docker-py/docker-py-3.4.1.ebuild
index 0ee6d675b43f..8e16af3feb1c 100644
--- a/dev-python/docker-py/docker-py-3.4.1.ebuild
+++ b/dev-python/docker-py/docker-py-3.4.1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+ $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
"
DEPEND="
diff --git a/dev-python/docker-py/docker-py-3.5.0.ebuild b/dev-python/docker-py/docker-py-3.5.0.ebuild
index 0ee6d675b43f..8e16af3feb1c 100644
--- a/dev-python/docker-py/docker-py-3.5.0.ebuild
+++ b/dev-python/docker-py/docker-py-3.5.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+ $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
"
DEPEND="
diff --git a/dev-python/docker-py/docker-py-3.5.1.ebuild b/dev-python/docker-py/docker-py-3.5.1.ebuild
index 0ee6d675b43f..8e16af3feb1c 100644
--- a/dev-python/docker-py/docker-py-3.5.1.ebuild
+++ b/dev-python/docker-py/docker-py-3.5.1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+ $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
"
DEPEND="
diff --git a/dev-python/docker-py/docker-py-3.6.0.ebuild b/dev-python/docker-py/docker-py-3.6.0.ebuild
index 8d80df67cbf1..c0ee1da6a19a 100644
--- a/dev-python/docker-py/docker-py-3.6.0.ebuild
+++ b/dev-python/docker-py/docker-py-3.6.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+ $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
"
DEPEND="
diff --git a/dev-python/docker-py/docker-py-3.7.0.ebuild b/dev-python/docker-py/docker-py-3.7.0.ebuild
index 821513d1cdd5..2573b1681c68 100644
--- a/dev-python/docker-py/docker-py-3.7.0.ebuild
+++ b/dev-python/docker-py/docker-py-3.7.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+ $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
"
DEPEND="
diff --git a/dev-python/docker-py/docker-py-3.7.1.ebuild b/dev-python/docker-py/docker-py-3.7.1.ebuild
index 821513d1cdd5..2573b1681c68 100644
--- a/dev-python/docker-py/docker-py-3.7.1.ebuild
+++ b/dev-python/docker-py/docker-py-3.7.1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+ $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
"
DEPEND="
diff --git a/dev-python/libcloud/libcloud-1.2.1.ebuild b/dev-python/libcloud/libcloud-1.2.1.ebuild
index 4a157b672ab6..f9ddebeb994f 100644
--- a/dev-python/libcloud/libcloud-1.2.1.ebuild
+++ b/dev-python/libcloud/libcloud-1.2.1.ebuild
@@ -23,7 +23,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? (
dev-python/mock[${PYTHON_USEDEP}]
dev-python/lockfile[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python{2_7,3_4} pypy)
+ $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
)"
S="${WORKDIR}/apache-${P}"
diff --git a/dev-python/libcloud/libcloud-1.5.0.ebuild b/dev-python/libcloud/libcloud-1.5.0.ebuild
index cccc27825a00..ab9abff3992f 100644
--- a/dev-python/libcloud/libcloud-1.5.0.ebuild
+++ b/dev-python/libcloud/libcloud-1.5.0.ebuild
@@ -23,7 +23,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? (
dev-python/mock[${PYTHON_USEDEP}]
dev-python/lockfile[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python{2_7,3_4} pypy)
+ $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
)"
# Known test failures
diff --git a/dev-python/libcloud/libcloud-2.3.0.ebuild b/dev-python/libcloud/libcloud-2.3.0.ebuild
index e2e01390c874..2f396c21fbd6 100644
--- a/dev-python/libcloud/libcloud-2.3.0.ebuild
+++ b/dev-python/libcloud/libcloud-2.3.0.ebuild
@@ -22,7 +22,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? (
dev-python/mock[${PYTHON_USEDEP}]
dev-python/lockfile[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python{2_7,3_4} pypy)
+ $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
)"
# Known test failures
diff --git a/dev-python/networkx/networkx-1.11-r1.ebuild b/dev-python/networkx/networkx-1.11-r1.ebuild
index e2a51f911ca0..2f04d349b386 100644
--- a/dev-python/networkx/networkx-1.11-r1.ebuild
+++ b/dev-python/networkx/networkx-1.11-r1.ebuild
@@ -27,7 +27,7 @@ DEPEND="
dev-python/sphinx[${PYTHON_USEDEP}]
dev-python/matplotlib[${PYTHON_USEDEP}]
$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7)
- $(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4})
+ $(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7)
)
test? (
${COMMON_DEPEND}
diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild
index 8703e904fbcf..f4f786cd4b18 100644
--- a/dev-python/networkx/networkx-1.11.ebuild
+++ b/dev-python/networkx/networkx-1.11.ebuild
@@ -27,7 +27,7 @@ DEPEND="
dev-python/sphinx[${PYTHON_USEDEP}]
dev-python/matplotlib[${PYTHON_USEDEP}]
$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7)
- $(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4})
+ $(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7)
)
test? (
${COMMON_DEPEND}
diff --git a/dev-python/nose/nose-1.3.7-r3.ebuild b/dev-python/nose/nose-1.3.7-r3.ebuild
index ab4205787852..e66f8269099a 100644
--- a/dev-python/nose/nose-1.3.7-r3.ebuild
+++ b/dev-python/nose/nose-1.3.7-r3.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
- test? ( || ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{4,5,6})
+ test? ( || ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{5,6})
$(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7)
) )"
diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild
index 49eecc641f2c..03c347f62ba1 100644
--- a/dev-python/nose/nose-9999.ebuild
+++ b/dev-python/nose/nose-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
- test? ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{4,5,6}) )"
+ test? ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{5,6}) )"
pkg_setup() {
use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
diff --git a/dev-python/pathlib2/pathlib2-2.3.0.ebuild b/dev-python/pathlib2/pathlib2-2.3.0.ebuild
index bc9789b18739..ef3be1691a51 100644
--- a/dev-python/pathlib2/pathlib2-2.3.0.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.0.ebuild
@@ -18,7 +18,7 @@ IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
- $(python_gen_cond_dep 'dev-python/scandir[${PYTHON_USEDEP}]' -2 python3_4 )
+ $(python_gen_cond_dep 'dev-python/scandir[${PYTHON_USEDEP}]' -2 )
dev-python/six[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pathlib2/pathlib2-2.3.2.ebuild b/dev-python/pathlib2/pathlib2-2.3.2.ebuild
index 0e6a84140539..6ed4c6a561a3 100644
--- a/dev-python/pathlib2/pathlib2-2.3.2.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.2.ebuild
@@ -18,7 +18,7 @@ IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
- $(python_gen_cond_dep 'dev-python/scandir[${PYTHON_USEDEP}]' -2 python3_4 )
+ $(python_gen_cond_dep 'dev-python/scandir[${PYTHON_USEDEP}]' -2 )
dev-python/six[${PYTHON_USEDEP}]
"
BDEPEND="
diff --git a/dev-python/pbr/pbr-3.1.1.ebuild b/dev-python/pbr/pbr-3.1.1.ebuild
index cb1f21eeb7b6..e06a16813f66 100644
--- a/dev-python/pbr/pbr-3.1.1.ebuild
+++ b/dev-python/pbr/pbr-3.1.1.ebuild
@@ -28,8 +28,8 @@ DEPEND="
>=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_4' 'python3_5' 'python3_6')]
- !~dev-python/sphinx-1.6.1[$(python_gen_usedep 'python2_7' 'python3_4' 'python3_5' 'python3_6')]
+ >=dev-python/sphinx-1.5.1[$(python_gen_usedep 'python2_7' 'python3_5' 'python3_6')]
+ !~dev-python/sphinx-1.6.1[$(python_gen_usedep 'python2_7' 'python3_5' '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}]
diff --git a/dev-python/pbr/pbr-4.2.0-r1.ebuild b/dev-python/pbr/pbr-4.2.0-r1.ebuild
index 9fe5cc4031bc..c90343e05e0f 100644
--- a/dev-python/pbr/pbr-4.2.0-r1.ebuild
+++ b/dev-python/pbr/pbr-4.2.0-r1.ebuild
@@ -35,7 +35,7 @@ DEPEND="
>=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/stestr-2.1.0[$(python_gen_usedep python{2_7,3_4,3_5,3_6})]
+ >=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_5,3_6})]
dev-python/wheel[${PYTHON_USEDEP}]
dev-vcs/git
)"
diff --git a/dev-python/pbr/pbr-4.2.0-r2.ebuild b/dev-python/pbr/pbr-4.2.0-r2.ebuild
index 459ba62ee9ee..ee6079aeb1c0 100644
--- a/dev-python/pbr/pbr-4.2.0-r2.ebuild
+++ b/dev-python/pbr/pbr-4.2.0-r2.ebuild
@@ -35,7 +35,7 @@ DEPEND="
>=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/stestr-2.1.0[$(python_gen_usedep python{2_7,3_4,3_5,3_6})]
+ >=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_5,3_6})]
dev-python/sphinx[${PYTHON_USEDEP}]
dev-python/wheel[${PYTHON_USEDEP}]
dev-vcs/git
diff --git a/dev-python/pbr/pbr-5.1.1.ebuild b/dev-python/pbr/pbr-5.1.1.ebuild
index 882b93763507..6b887279b330 100644
--- a/dev-python/pbr/pbr-5.1.1.ebuild
+++ b/dev-python/pbr/pbr-5.1.1.ebuild
@@ -36,7 +36,7 @@ DEPEND="
>=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/stestr-2.1.0[$(python_gen_usedep python{2_7,3_4,3_5,3_6})]
+ >=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_5,3_6})]
>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild
index 2e6083347900..1c3d5839d66e 100644
--- a/dev-python/pytest/pytest-3.10.1.ebuild
+++ b/dev-python/pytest/pytest-3.10.1.ebuild
@@ -26,8 +26,8 @@ RDEPEND="
>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
$(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python2_7 )
$(python_gen_cond_dep '<dev-python/more-itertools-6.0.0[${PYTHON_USEDEP}]' python2_7 )
- $(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python3_{4,5,6,7} pypy{,3} )
- $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_{4,5} )
+ $(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python3_{5,6,7} pypy{,3} )
+ $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_5 )
>=dev-python/pluggy-0.7[${PYTHON_USEDEP}]
>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
>=dev-python/setuptools-40[${PYTHON_USEDEP}]
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
index 4b62a6bae633..2b49051b9e24 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
@@ -7,9 +7,10 @@ PYTHON_COMPAT=( python3_{5,6} )
inherit distutils-r1 vcs-snapshot
+MY_PN="${PN//-/.}"
+
DESCRIPTION="Ruamel enhancements to pathlib and pathlib2"
HOMEPAGE="https://pypi.org/project/ruamel.std.pathlib/ https://bitbucket.org/ruamel/std.pathlib"
-MY_PN="${PN//-/.}"
SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
@@ -17,10 +18,7 @@ SLOT="0"
KEYWORDS="amd64 ~arm64 ~x86"
IUSE="test"
-RDEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python3_4)
-"
+RDEPEND=""
DEPEND="
${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
@@ -30,11 +28,11 @@ DEPEND="
)
"
+python_test() {
+ py.test -v _test/test_*.py || die
+}
+
python_install() {
distutils-r1_python_install --single-version-externally-managed
find "${ED}" -name '*.pth' -delete || die
}
-
-python_test() {
- py.test -v _test/test_*.py || die
-}
diff --git a/dev-python/twine/twine-1.11.0.ebuild b/dev-python/twine/twine-1.11.0.ebuild
index 2cc35ad16d9d..57447fb1ddfc 100644
--- a/dev-python/twine/twine-1.11.0.ebuild
+++ b/dev-python/twine/twine-1.11.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="${CDEPEND}
>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5})
+ $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5})
"
PATCHES=( "${FILESDIR}"/${P}-tests.patch )