From 18ea8dba65d5463a9c5d25356a40d17ed7864b2e Mon Sep 17 00:00:00 2001 From: Ian Delaney Date: Thu, 2 Oct 2014 10:01:48 +0000 Subject: [PATCH] clean old python impls, add py3.3 3.4 support, add IUSE test and testrunner dep, upgrade test phase, fixes bug #524246 by W. T. King requesting added py3 support, rm old Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xB8072B0D --- ChangeLog | 8 +++++++ Manifest | 1 - execnet-1.0.9.ebuild | 45 -------------------------------------- execnet-1.2.0-r1.ebuild | 17 ++++++++++----- execnet-1.2.0.ebuild | 48 ----------------------------------------- 5 files changed, 20 insertions(+), 99 deletions(-) delete mode 100644 execnet-1.0.9.ebuild delete mode 100644 execnet-1.2.0.ebuild diff --git a/ChangeLog b/ChangeLog index 416638d..1c55659 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header$ +*execnet-1.2.0-r1 (02 Oct 2014) + + 02 Oct 2014; Ian Delaney +execnet-1.2.0-r1.ebuild, + -execnet-1.0.9.ebuild, -execnet-1.2.0.ebuild: + clean old python impls, add py3.3 3.4 support, add IUSE test and testrunner + dep, upgrade test phase, fixes bug #524246 by W. T. King requesting added py3 + support, rm old + 31 Mar 2014; Michał Górny execnet-1.1-r1.ebuild, execnet-1.2.0.ebuild: Add support for the new PyPy slotting. diff --git a/Manifest b/Manifest index 9285501..7dd2373 100644 --- a/Manifest +++ b/Manifest @@ -1,3 +1,2 @@ -DIST execnet-1.0.9.zip 297854 SHA256 ab974982ce5f9a3b7aa81da08e9605716d77a61abdf61f2f0846456e7fa91386 SHA512 7bd2577fc06aa8530d6e758ac0b9b88587b582b9a86cd26c58bec8d7b49e531145c1777da2e0122c1fe9d66db13b27a1e7f6e689839c923eb33ea88571697aa3 WHIRLPOOL 998fa06fb4dcd690f8f210da194d93ec9301dfa32d68757730b05da9775d7783bdbae8fbdef60ffcfc33051666d718262ddb570cdd10000813eb05a64025be91 DIST execnet-1.1.zip 324708 SHA256 fa1d8bd6b6d2282ff4df474b8ac687e1775bff4fc6462b219a5f89d5e9e6908c SHA512 52ccdeca41229aed44e62e34476f42126ec00ef0c878267de3a5c706bf265d1d79945b9fd27f608b9cdc5512bda66662b545f96053160fbadb568f667e95a71e WHIRLPOOL 93a5bfd46e37838cd429daf827d712832c54102aa75d57e78970481b19dc2763de760332aefc5026f2c190043ef636fc35a45a47c4a7034af2925600d60b6d96 DIST execnet-1.2.0.tar.gz 163876 SHA256 951714caa0ae80237f4ffc1f08450e9e2e5f8f902beaf1ad294020875d6f8c2c SHA512 bf4eb1c07832628863f3d315510628343bc4504050311a277a86100a825df8ed5f6b65f58db28ea6733f3886b6007eae7fd33586721374f9ffb3687e9b95d5c4 WHIRLPOOL 898d9427d55e316f2cdfe06d8dadd0f40d8d2374802b419c9b7aac279eed36919f8dc0084c9c253b3b3d75e9dd50ec2748ef2227e803bf900d7d8b0d5395c45e diff --git a/execnet-1.0.9.ebuild b/execnet-1.0.9.ebuild deleted file mode 100644 index c4c2cb7..0000000 --- a/execnet-1.0.9.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header$ - -EAPI="3" -SUPPORT_PYTHON_ABIS="1" -DISTUTILS_SRC_TEST="py.test" - -inherit distutils - -DESCRIPTION="Rapid multi-Python deployment" -HOMEPAGE="http://codespeak.net/execnet/ http://pypi.python.org/pypi/execnet/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -DEPEND="app-arch/unzip - dev-python/setuptools - doc? ( dev-python/sphinx )" -RDEPEND="" - -src_compile() { - distutils_src_compile - - if use doc; then - einfo "Generation of documentation" - cd doc - emake html || die "Generation of documentation failed" - fi -} - -src_test() { - distutils_src_test testing -} - -src_install() { - distutils_src_install - - if use doc; then - dohtml -r doc/_build/html/* || die "Installation of documentation failed" - fi -} diff --git a/execnet-1.2.0-r1.ebuild b/execnet-1.2.0-r1.ebuild index 76d28ee..12e07cb 100644 --- a/execnet-1.2.0-r1.ebuild +++ b/execnet-1.2.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy pypy2_0 ) +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) inherit distutils-r1 @@ -15,21 +15,27 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc" +IUSE="doc test" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( dev-python/pytest[${PYTHON_USEDEP}] )" RDEPEND="" +python_prepare_all() { + # Remove doctest that access an i'net sire + rm doc/example/test_info.txt || die + + distutils-r1_python_prepare_all +} + python_compile_all() { use doc && emake -C doc html } src_test() { # Tests are a bit fragile to failures in parallel. - # XXX: take a closer look, it may be easy to fix. local DISTUTILS_NO_PARALLEL_BUILD=1 - distutils-r1_src_test } @@ -38,6 +44,7 @@ python_test() { # https://bitbucket.org/hpk42/execnet/issue/10 unset PYTHONDONTWRITEBYTECODE + # https://bitbucket.org/hpk42/execnet/issue/35/test-failures-in-execnet-120 py.test || die "Tests fail with ${EPYTHON}" } diff --git a/execnet-1.2.0.ebuild b/execnet-1.2.0.ebuild deleted file mode 100644 index 3da272c..0000000 --- a/execnet-1.2.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy pypy2_0 ) - -inherit distutils-r1 - -DESCRIPTION="Rapid multi-Python deployment" -HOMEPAGE="http://codespeak.net/execnet/ http://pypi.python.org/pypi/execnet/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" -RDEPEND="" - -python_compile_all() { - use doc && emake -C doc html -} - -src_test() { - # Tests are a bit fragile to failures in parallel. - # XXX: take a closer look, it may be easy to fix. - local DISTUTILS_NO_PARALLEL_BUILD=1 - - distutils-r1_src_test -} - -python_test() { - # Re-enable in order to properly test disabling it ;). - # https://bitbucket.org/hpk42/execnet/issue/10 - unset PYTHONDONTWRITEBYTECODE - - py.test || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - - distutils-r1_python_install_all -} -- 2.26.2