add patch from upstream, re-based, improving but not fixing testsute completely

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 185 insertions, 5 deletions

diff --git a/dev-python/execnet/ChangeLog b/dev-python/execnet/ChangeLog
index b6567aa58995..5174d7b6bb91 100644
--- a/dev-python/execnet/ChangeLog
+++ b/dev-python/execnet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/execnet
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/execnet/ChangeLog,v 1.20 2014/10/02 10:01:48 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/execnet/ChangeLog,v 1.21 2014/10/10 13:34:07 idella4 Exp $
+
+*execnet-1.2.0-r2 (10 Oct 2014)
+
+  10 Oct 2014; Ian Delaney <idella4@gentoo.org> +execnet-1.2.0-r2.ebuild,
+  +files/1.2.0-tests.patch:
+  add patch from upstream, re-based, improving but not fixing testsute
+  completely
 
 *execnet-1.2.0-r1 (02 Oct 2014)
 
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index 89810e8c6a13..133cd9dfb65d 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 1.2.0-tests.patch 4493 SHA256 738750611c7a1be02e6ef18c84984d632fbd8d48e9e2b3c41adbe3adee71072b SHA512 77749358c1baac321da56dd40e40b3d8894f12950cbd1b86f98ff5e280c62d5567481a6afccaabc6e46b4495696309a3f518c9a75b8e5ed891c8a3c382b3c735 WHIRLPOOL 4a47cb80620fcd56c7593994bda7a14c925a0c742942236c6b7fe00b7f4558922d67a08f784fe626d5e3523d28ed28eed09fd247df4756499156b58cbd1aacd0
 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
 EBUILD execnet-1.1-r1.ebuild 1201 SHA256 becb382e88fd7ccad446dfdf673cc7d773ca3c3c2a1680f0addd06fbe70d37d7 SHA512 378a57810e4d4eae8edc2ff9c778ed33f491e92b85cbbb6d7fc754e4e95796ae73da77da56548f7a5e656f97b0f4a7d4d87f77802ef17589bbb40d8504f3eb06 WHIRLPOOL f10e0d358028ddb6b6f1bab8ec77f0e9468d04082eba6a8830736cdf5339e8a35077f994c02832804a21463fc1925e2471b63068ed04dbef44f20018095f9098
 EBUILD execnet-1.1.ebuild 882 SHA256 2f94a327c4446fcd22ff01809778c586b8dcd86fbf4a61115cf060eaced7510e SHA512 be6d9080860c8c5d23c1607d6e7859f640f5ff50f672f0246a6a3b9ac71a568e0731df25bcaecd823f7c459d2ec439504f40a4d8f9af4e568b6a07eecd2c76a4 WHIRLPOOL 2953922232b9f3213f5801045f479c4f602b3d9987e5c000bbabfe7da7392d18d3a9f02210611964c4d7ba05aa6140b58303c002442d2b2c60d30fe6841030b8
 EBUILD execnet-1.2.0-r1.ebuild 1403 SHA256 33b7c9c963fcb720f15ff1a1654f7b1de64dbb49f68c096e71fe9f4d96287ee5 SHA512 6967de36c0e0f3646ff4995b19f9a741d81724310e9a31234af160f045a4df7aecd5c32ab883e09fab74f881cd37b5f6123a9f0596fa2509b3aa666cc7b8f9f1 WHIRLPOOL 65a358911aff1024528307730a384ad567f381410b2bd3c9c2feda40982cb47359bd168f9d79572c1dd0f0c7e3a884ccf41695173b3d398d60b720d5b833f81c
-MISC ChangeLog 3245 SHA256 ae89ec8b45cb920a9cb2a583e7a37b7d54938c56ddbbf57ec6e2eed1e23e5ca1 SHA512 2620b5cb54a7cdd5b1f984de2bb7e4de3b4b2a22c8a99aceb99b9161d68a5d1924701ca2da58cbfdea69d6485f8ada1a8a312a433bcbb78684600f660c77a65a WHIRLPOOL 7d2518c87ed31cfcee445674e535ef578dddde32e2640e9ba02754a224c82fa82d2270758622034cbb87ab67cda796e216483bb43fd499dd8c482d295c84e28b
+EBUILD execnet-1.2.0-r2.ebuild 1392 SHA256 910c5b9090e8b734132a18107fef515a58ce94ba8ebf48eee0bd63fa244194ed SHA512 ebadc5b8a54fb568fbbf7a15c0bbf236b1fd291230693b5272191d2fb0a54c4c27a5d29ce7c008f1eed0db56b3e9334bfa81bf6f2c1632137312a247c8d298c1 WHIRLPOOL bb83588c4342d94738ab23538ccf8a5d527cfd9a98c3983c40c06f5b95b8e1253244f3331a9b7440c93947ce5635ee40501fecd41873583abddc22f667f85bec
+MISC ChangeLog 3465 SHA256 954cc8ad340d9bb8dfd4cba92ed6056598088440f45cce3aa1a7fefd34594705 SHA512 4911d98032da1dc6e96ff997ea04fc640c6b7b1845648e5c600960b0b711b309bfcaf71482966b50c00947945b9b5e19253bfb2f6baa8a93451958bc2368cfe9 WHIRLPOOL 5f8ef5f54b0ad0d3cda29cde5eb4e8b0a62e8d8eb60c87a929d02c5d9afd4a0de5df87e95ec6f0204f789392ef92f3ca592b6a751329eebb374f362f0f057a99
 MISC metadata.xml 443 SHA256 b38fdb5d7dba3a8b2167cf95e64ec10f8e01c911ea5397a2efd00ffbecc0865e SHA512 db1c66776ca96df607ef08a806f41954b1b7677fa32c02e33ae67a8daaf04b797c6f8bbc17e53fdbfadc0cb473ead82347fa1374dace31fb18722428bd7a91cf WHIRLPOOL bec892ffd13dcd5b7744c2fb0a049007cc628fa6047d0b4f232ee91552bd2e62d2e17d564aab77435f62d6285d4e237f493f95ca8f63f1b740de070f4b9eb617
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlQtIpwACgkQso7CE7gHKw3O9QCg1ms4Cn1zyADunUWKv1AGabe/
-zHQAoIopDinDcdStSXsuaoXUTSfqEwuT
-=rkxc
+iEYEAREIAAYFAlQ34GAACgkQso7CE7gHKw2mTwCgnsLlrFrD2oLoG1WuRayQjyK4
+LQQAoMkANsPwXj4o1B01wV9qdyIh8E8U
+=IBXi
 -----END PGP SIGNATURE-----
diff --git a/dev-python/execnet/execnet-1.2.0-r2.ebuild b/dev-python/execnet/execnet-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..9b992b1c5024
--- /dev/null
+++ b/dev-python/execnet/execnet-1.2.0-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/execnet/execnet-1.2.0-r2.ebuild,v 1.1 2014/10/10 13:34:07 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+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 test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/1.2.0-tests.patch )
+
+python_prepare_all() {
+	# Remove doctest that access an i'net site
+	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.
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	distutils-r1_src_test
+}
+
+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}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/execnet/files/1.2.0-tests.patch b/dev-python/execnet/files/1.2.0-tests.patch
new file mode 100644
index 000000000000..13bed5d59605
--- /dev/null
+++ b/dev-python/execnet/files/1.2.0-tests.patch
@@ -0,0 +1,115 @@
+# HG changeset patch
+# User holger krekel <holger@merlinux.eu>
+# Date 1412585605 -7200
+# Node ID c9303c302995a4fb844553d4977c55abc72e2020
+# Parent  47ff3652b0aed191f7bafc741c211d1415f65224
+fix issue35: adapt some doctests, fix some channel tests for py3.
+Also modernize tox.ini a bit.
+--rebased
+diff -ur execnet-1.2.0.orig/doc/example/test_group.txt execnet-1.2.0/doc/example/test_group.txt
+--- doc/example/test_group.txt	2014-01-29 19:50:22.000000000 +0800
++++ doc/example/test_group.txt	2014-10-10 19:51:00.108828123 +0800
+@@ -14,7 +14,7 @@
+     >>> group
+     <Group ['gw0', 'gw1']>
+     >>> list(group)
+-    [<PopenGateway id='gw0' receive-live, 0 active channels>, <PopenGateway id='gw1' receive-live, 0 active channels>]
++    [<Gateway id='gw0' receive-live, thread model, 0 active channels>, <Gateway id='gw1' receive-live, thread model, 0 active channels>]
+     >>> 'gw0' in group and 'gw1' in group
+     True
+     >>> group['gw0'] == group[0]
+@@ -37,7 +37,7 @@
+     >>> gw = group.makegateway("popen//id=sub1")
+     >>> assert gw.id == "sub1"
+     >>> group['sub1']
+-    <PopenGateway id='sub1' receive-live, 0 active channels>
++    <Gateway id='sub1' receive-live, thread model, 0 active channels>
+ 
+ Getting (auto) IDs before instantiation
+ ------------------------------------------------------
+diff -ur execnet-1.2.0.orig/doc/example/test_proxy.txt execnet-1.2.0/doc/example/test_proxy.txt
+--- doc/example/test_proxy.txt	2014-01-29 19:50:22.000000000 +0800
++++ doc/example/test_proxy.txt	2014-10-10 19:16:50.380156509 +0800
+@@ -18,10 +18,10 @@
+     >>> group.defaultspec = 'popen//via=master'
+     >>> master = group.makegateway('popen//id=master')
+     >>> master
+-    <Gateway id='master' receive-live, 0 active channels>
++    <Gateway id='master' receive-live, thread model, 0 active channels>
+     >>> slave = group.makegateway()
+     >>> slave
+-    <Gateway id='gw0' receive-live, 0 active channels>
++    <Gateway id='gw0' receive-live, thread model, 0 active channels>
+     >>> group
+     <Group ['master', 'gw0']>
+ 
+diff -ur execnet-1.2.0.orig/testing/test_channel.py execnet-1.2.0/testing/test_channel.py
+--- testing/test_channel.py	2014-01-29 19:50:22.000000000 +0800
++++ testing/test_channel.py	2014-10-10 19:21:00.943955387 +0800
+@@ -68,25 +68,19 @@
+ 
+     def test_channel_error_reporting(self, gw):
+         channel = gw.remote_exec('def foo():\n  return foobar()\nfoo()\n')
+-        try:
+-            channel.receive()
+-        except channel.RemoteError:
+-            e = sys.exc_info()[1]
+-            assert str(e).startswith('Traceback (most recent call last):')
+-            assert str(e).find('NameError: global name \'foobar\' '
+-                               'is not defined') > -1
+-        else:
+-            pytest.fail('No exception raised')
++        excinfo = pytest.raises(channel.RemoteError, channel.receive)
++        msg = str(excinfo.value)
++        assert msg.startswith('Traceback (most recent call last):')
++        assert "NameError" in msg
++        assert "foobar" in msg
+ 
+     def test_channel_syntax_error(self, gw):
+         # missing colon
+         channel = gw.remote_exec('def foo()\n return 1\nfoo()\n')
+-        try:
+-            channel.receive()
+-        except channel.RemoteError:
+-            e = sys.exc_info()[1]
+-            assert str(e).startswith('Traceback (most recent call last):')
+-            assert str(e).find('SyntaxError') > -1
++        excinfo = pytest.raises(channel.RemoteError, channel.receive)
++        msg = str(excinfo.value)
++        assert msg.startswith('Traceback (most recent call last):')
++        assert "SyntaxError" in msg
+ 
+     def test_channel_iter(self, gw):
+         channel = gw.remote_exec("""
+diff -ur execnet-1.2.0.orig/tox.ini execnet-1.2.0/tox.ini
+--- tox.ini	2014-01-29 19:50:22.000000000 +0800
++++ tox.ini	2014-10-10 20:14:22.806301771 +0800
+@@ -1,16 +1,11 @@
+ [tox]
+-envlist=py26,py27,py32,py33,pypy,flakes
+-distshare={homedir}/.tox/distshare
+-
+-[tox:hudson]
+-distshare={toxworkdir}/distshare
+-sdistsrc={distshare}/execnet-*
++envlist=py26,py27,py33,py34,pypy,flakes
+ 
+ [testenv]
+ changedir=testing
+ deps=pytest
+      pytest-timeout
+-commands=py.test -rsfxX --junitxml={envlogdir}/junit-{envname}.xml []
++commands=py.test -rsfxX {posargs}
+ 
+ [testenv:flakes]
+ changedir=
+@@ -26,8 +21,7 @@
+ deps=sphinx
+      pytest
+ commands=
+-    py.test \
+-        -rsfxX -v --junitxml={envlogdir}/junit-{envname}.xml check_sphinx.py
++    py.test  -rsfxX -v check_sphinx.py
+ 
+ [pytest]
+ timeout = 20