Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/twisted/
Date: Sun, 26 Apr 2020 22:23:56
Message-Id: 1587939781.41b210e3e9683295fff6caf9d1ffb0c7b591a2fb.whissi@gentoo
1 commit: 41b210e3e9683295fff6caf9d1ffb0c7b591a2fb
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 26 22:23:01 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 26 22:23:01 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41b210e3
7
8 dev-python/twisted: drop conch tests
9
10 Forward commit 640ceed5adb749f557d2d55bd2cd07303a1a4d9d.
11
12 Package-Manager: Portage-2.3.99, Repoman-2.3.22
13 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
14
15 dev-python/twisted/twisted-19.10.0.ebuild | 6 ++++++
16 dev-python/twisted/twisted-20.3.0.ebuild | 6 ++++++
17 2 files changed, 12 insertions(+)
18
19 diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
20 index 1112e8b1d49..074f0cee66f 100644
21 --- a/dev-python/twisted/twisted-19.10.0.ebuild
22 +++ b/dev-python/twisted/twisted-19.10.0.ebuild
23 @@ -86,6 +86,12 @@ python_prepare_all() {
24 # sphinx (including on py2)
25 rm src/twisted/python/test/test_release.py || die
26
27 + # Conch doesn't work with latest >=OpenSSH 7.6
28 + # - https://twistedmatrix.com/trac/ticket/9311
29 + # - https://twistedmatrix.com/trac/ticket/9515
30 + rm src/twisted/conch/test/test_conch.py || die "rm src/twisted/conch/test/test_conch.py FAILED"
31 + rm src/twisted/conch/test/test_cftp.py || die "rm src/twisted/conch/test/test_cftp.py FAILED"
32 +
33 # puts system in EMFILE state, then the exception handler may fail
34 # trying to open more files due to some gi magic
35 sed -e '/SKIP_EMFILE/s:None:"Fails on non-pristine systems":' \
36
37 diff --git a/dev-python/twisted/twisted-20.3.0.ebuild b/dev-python/twisted/twisted-20.3.0.ebuild
38 index 1f547fbdba4..3294057943d 100644
39 --- a/dev-python/twisted/twisted-20.3.0.ebuild
40 +++ b/dev-python/twisted/twisted-20.3.0.ebuild
41 @@ -90,6 +90,12 @@ python_prepare_all() {
42 # sphinx (including on py2)
43 rm src/twisted/python/test/test_release.py || die
44
45 + # Conch doesn't work with latest >=OpenSSH 7.6
46 + # - https://twistedmatrix.com/trac/ticket/9311
47 + # - https://twistedmatrix.com/trac/ticket/9515
48 + rm src/twisted/conch/test/test_conch.py || die "rm src/twisted/conch/test/test_conch.py FAILED"
49 + rm src/twisted/conch/test/test_cftp.py || die "rm src/twisted/conch/test/test_cftp.py FAILED"
50 +
51 # puts system in EMFILE state, then the exception handler may fail
52 # trying to open more files due to some gi magic
53 sed -e '/SKIP_EMFILE/s:None:"Fails on non-pristine systems":' \