mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-20 10:17:08 -08:00
*/*: Remove last vestiges of python3_4
Closes: https://github.com/gentoo/gentoo/pull/11755 Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
@@ -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? (
|
||||
|
||||
@@ -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? (
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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}]
|
||||
|
||||
@@ -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="
|
||||
|
||||
@@ -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="
|
||||
|
||||
@@ -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="
|
||||
|
||||
@@ -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="
|
||||
|
||||
@@ -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="
|
||||
|
||||
@@ -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="
|
||||
|
||||
@@ -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="
|
||||
|
||||
@@ -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="
|
||||
|
||||
@@ -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}"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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)
|
||||
) )"
|
||||
|
||||
|
||||
@@ -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*' )
|
||||
|
||||
@@ -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}]
|
||||
|
||||
@@ -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="
|
||||
|
||||
@@ -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}]
|
||||
|
||||
@@ -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
|
||||
)"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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}]
|
||||
|
||||
@@ -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}]
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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 )
|
||||
|
||||
Reference in New Issue
Block a user