Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/execnet/files/, dev-python/execnet/
Date: Wed, 03 May 2017 09:26:47
Message-Id: 1493803566.ec2fc2782323bca475342a9c25e5495fcff473d1.mgorny@gentoo
1 commit: ec2fc2782323bca475342a9c25e5495fcff473d1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 3 08:03:43 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed May 3 09:26:06 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec2fc278
7
8 dev-python/execnet: Clean old versions up
9
10 dev-python/execnet/Manifest | 1 -
11 dev-python/execnet/execnet-1.2.0-r2.ebuild | 48 ------------
12 dev-python/execnet/files/1.2.0-tests.patch | 115 -----------------------------
13 3 files changed, 164 deletions(-)
14
15 diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
16 index fdf1a65c218..aa51fef73b9 100644
17 --- a/dev-python/execnet/Manifest
18 +++ b/dev-python/execnet/Manifest
19 @@ -1,2 +1 @@
20 -DIST execnet-1.2.0.tar.gz 163876 SHA256 951714caa0ae80237f4ffc1f08450e9e2e5f8f902beaf1ad294020875d6f8c2c SHA512 bf4eb1c07832628863f3d315510628343bc4504050311a277a86100a825df8ed5f6b65f58db28ea6733f3886b6007eae7fd33586721374f9ffb3687e9b95d5c4 WHIRLPOOL 898d9427d55e316f2cdfe06d8dadd0f40d8d2374802b419c9b7aac279eed36919f8dc0084c9c253b3b3d75e9dd50ec2748ef2227e803bf900d7d8b0d5395c45e
21 DIST execnet-1.4.1.tar.gz 171041 SHA256 f66dd4a7519725a1b7e14ad9ae7d3df8e09b2da88062386e08e941cafc0ef3e6 SHA512 e8c0c32e873f8585ff4d4da3b9cbd40046479370f5653f67a98c9029d4535a619731d1b825332fe4af4dc5ebc9ab11ee879ef45df07f08943b1e1685f2255790 WHIRLPOOL 487c31617b78e4eeed9dc75ae8f01ade33aad35f7547677ec007b688071dd56e69c4f4b92cf9355dee7cea97bf6eac09f508099f104cf52d6c9fe3860e4fd3c9
22
23 diff --git a/dev-python/execnet/execnet-1.2.0-r2.ebuild b/dev-python/execnet/execnet-1.2.0-r2.ebuild
24 deleted file mode 100644
25 index ac4cc1275ea..00000000000
26 --- a/dev-python/execnet/execnet-1.2.0-r2.ebuild
27 +++ /dev/null
28 @@ -1,48 +0,0 @@
29 -# Copyright 1999-2015 Gentoo Foundation
30 -# Distributed under the terms of the GNU General Public License v2
31 -
32 -EAPI=5
33 -
34 -PYTHON_COMPAT=( python{2_7,3_4} pypy )
35 -
36 -inherit distutils-r1
37 -
38 -DESCRIPTION="Rapid multi-Python deployment"
39 -HOMEPAGE="http://codespeak.net/execnet/ https://pypi.python.org/pypi/execnet/"
40 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
41 -
42 -LICENSE="MIT"
43 -SLOT="0"
44 -KEYWORDS="amd64 x86"
45 -IUSE="doc test"
46 -
47 -RDEPEND=""
48 -DEPEND="
49 - dev-python/setuptools[${PYTHON_USEDEP}]
50 - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
51 - test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
52 -
53 -PATCHES=( "${FILESDIR}"/1.2.0-tests.patch )
54 -
55 -python_prepare_all() {
56 - # Remove doctest that access an i'net site
57 - rm doc/example/test_info.txt || die
58 -
59 - distutils-r1_python_prepare_all
60 -}
61 -
62 -python_compile_all() {
63 - use doc && emake -C doc html
64 -}
65 -
66 -python_test() {
67 - # https://bitbucket.org/hpk42/execnet/issue/10
68 - unset PYTHONDONTWRITEBYTECODE
69 - py.test testing || die "Tests fail with ${EPYTHON}"
70 -}
71 -
72 -python_install_all() {
73 - use doc && local HTML_DOCS=( doc/_build/html/. )
74 -
75 - distutils-r1_python_install_all
76 -}
77
78 diff --git a/dev-python/execnet/files/1.2.0-tests.patch b/dev-python/execnet/files/1.2.0-tests.patch
79 deleted file mode 100644
80 index 13bed5d5960..00000000000
81 --- a/dev-python/execnet/files/1.2.0-tests.patch
82 +++ /dev/null
83 @@ -1,115 +0,0 @@
84 -# HG changeset patch
85 -# User holger krekel <holger@××××××××.eu>
86 -# Date 1412585605 -7200
87 -# Node ID c9303c302995a4fb844553d4977c55abc72e2020
88 -# Parent 47ff3652b0aed191f7bafc741c211d1415f65224
89 -fix issue35: adapt some doctests, fix some channel tests for py3.
90 -Also modernize tox.ini a bit.
91 ---rebased
92 -diff -ur execnet-1.2.0.orig/doc/example/test_group.txt execnet-1.2.0/doc/example/test_group.txt
93 ---- doc/example/test_group.txt 2014-01-29 19:50:22.000000000 +0800
94 -+++ doc/example/test_group.txt 2014-10-10 19:51:00.108828123 +0800
95 -@@ -14,7 +14,7 @@
96 - >>> group
97 - <Group ['gw0', 'gw1']>
98 - >>> list(group)
99 -- [<PopenGateway id='gw0' receive-live, 0 active channels>, <PopenGateway id='gw1' receive-live, 0 active channels>]
100 -+ [<Gateway id='gw0' receive-live, thread model, 0 active channels>, <Gateway id='gw1' receive-live, thread model, 0 active channels>]
101 - >>> 'gw0' in group and 'gw1' in group
102 - True
103 - >>> group['gw0'] == group[0]
104 -@@ -37,7 +37,7 @@
105 - >>> gw = group.makegateway("popen//id=sub1")
106 - >>> assert gw.id == "sub1"
107 - >>> group['sub1']
108 -- <PopenGateway id='sub1' receive-live, 0 active channels>
109 -+ <Gateway id='sub1' receive-live, thread model, 0 active channels>
110 -
111 - Getting (auto) IDs before instantiation
112 - ------------------------------------------------------
113 -diff -ur execnet-1.2.0.orig/doc/example/test_proxy.txt execnet-1.2.0/doc/example/test_proxy.txt
114 ---- doc/example/test_proxy.txt 2014-01-29 19:50:22.000000000 +0800
115 -+++ doc/example/test_proxy.txt 2014-10-10 19:16:50.380156509 +0800
116 -@@ -18,10 +18,10 @@
117 - >>> group.defaultspec = 'popen//via=master'
118 - >>> master = group.makegateway('popen//id=master')
119 - >>> master
120 -- <Gateway id='master' receive-live, 0 active channels>
121 -+ <Gateway id='master' receive-live, thread model, 0 active channels>
122 - >>> slave = group.makegateway()
123 - >>> slave
124 -- <Gateway id='gw0' receive-live, 0 active channels>
125 -+ <Gateway id='gw0' receive-live, thread model, 0 active channels>
126 - >>> group
127 - <Group ['master', 'gw0']>
128 -
129 -diff -ur execnet-1.2.0.orig/testing/test_channel.py execnet-1.2.0/testing/test_channel.py
130 ---- testing/test_channel.py 2014-01-29 19:50:22.000000000 +0800
131 -+++ testing/test_channel.py 2014-10-10 19:21:00.943955387 +0800
132 -@@ -68,25 +68,19 @@
133 -
134 - def test_channel_error_reporting(self, gw):
135 - channel = gw.remote_exec('def foo():\n return foobar()\nfoo()\n')
136 -- try:
137 -- channel.receive()
138 -- except channel.RemoteError:
139 -- e = sys.exc_info()[1]
140 -- assert str(e).startswith('Traceback (most recent call last):')
141 -- assert str(e).find('NameError: global name \'foobar\' '
142 -- 'is not defined') > -1
143 -- else:
144 -- pytest.fail('No exception raised')
145 -+ excinfo = pytest.raises(channel.RemoteError, channel.receive)
146 -+ msg = str(excinfo.value)
147 -+ assert msg.startswith('Traceback (most recent call last):')
148 -+ assert "NameError" in msg
149 -+ assert "foobar" in msg
150 -
151 - def test_channel_syntax_error(self, gw):
152 - # missing colon
153 - channel = gw.remote_exec('def foo()\n return 1\nfoo()\n')
154 -- try:
155 -- channel.receive()
156 -- except channel.RemoteError:
157 -- e = sys.exc_info()[1]
158 -- assert str(e).startswith('Traceback (most recent call last):')
159 -- assert str(e).find('SyntaxError') > -1
160 -+ excinfo = pytest.raises(channel.RemoteError, channel.receive)
161 -+ msg = str(excinfo.value)
162 -+ assert msg.startswith('Traceback (most recent call last):')
163 -+ assert "SyntaxError" in msg
164 -
165 - def test_channel_iter(self, gw):
166 - channel = gw.remote_exec("""
167 -diff -ur execnet-1.2.0.orig/tox.ini execnet-1.2.0/tox.ini
168 ---- tox.ini 2014-01-29 19:50:22.000000000 +0800
169 -+++ tox.ini 2014-10-10 20:14:22.806301771 +0800
170 -@@ -1,16 +1,11 @@
171 - [tox]
172 --envlist=py26,py27,py32,py33,pypy,flakes
173 --distshare={homedir}/.tox/distshare
174 --
175 --[tox:hudson]
176 --distshare={toxworkdir}/distshare
177 --sdistsrc={distshare}/execnet-*
178 -+envlist=py26,py27,py33,py34,pypy,flakes
179 -
180 - [testenv]
181 - changedir=testing
182 - deps=pytest
183 - pytest-timeout
184 --commands=py.test -rsfxX --junitxml={envlogdir}/junit-{envname}.xml []
185 -+commands=py.test -rsfxX {posargs}
186 -
187 - [testenv:flakes]
188 - changedir=
189 -@@ -26,8 +21,7 @@
190 - deps=sphinx
191 - pytest
192 - commands=
193 -- py.test \
194 -- -rsfxX -v --junitxml={envlogdir}/junit-{envname}.xml check_sphinx.py
195 -+ py.test -rsfxX -v check_sphinx.py
196 -
197 - [pytest]
198 - timeout = 20