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/testrepository/files/, dev-python/testrepository/
Date: Sun, 29 Mar 2020 10:13:42
Message-Id: 1585476782.874694cc0c739d6523047b4722b1b52b73a99fda.mgorny@gentoo
1 commit: 874694cc0c739d6523047b4722b1b52b73a99fda
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 29 09:59:27 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 29 10:13:02 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=874694cc
7
8 dev-python/testrepository: Remove redundant versions
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/testrepository/Manifest | 1 -
13 .../testrepository-0.0.18-test-backport.patch | 41 ------------------
14 .../testrepository/testrepository-0.0.18-r1.ebuild | 49 ----------------------
15 3 files changed, 91 deletions(-)
16
17 diff --git a/dev-python/testrepository/Manifest b/dev-python/testrepository/Manifest
18 index 7467dd1ed44..013694ad922 100644
19 --- a/dev-python/testrepository/Manifest
20 +++ b/dev-python/testrepository/Manifest
21 @@ -1,2 +1 @@
22 -DIST testrepository-0.0.18.tar.gz 84886 BLAKE2B b6c0161c55271722644eddd5d620ea67b67774e92d2de0117f645fc1016c9de209de6a9557862a27e08850a3ade5a2406ea5eaa410a2ce4d44fc26c8121ddecf SHA512 4e90db6364f77f464ae063020b016367529588f581af001c2564bf4babb264fc37bb7231413725211c6d483a269360d86201f81d2b24d7eb162dca2463d13c92
23 DIST testrepository-0.0.20.tar.gz 84956 BLAKE2B 9b9a8e0c21754fe8ba019b58024f137e72b4341cb368fb48dc48039f512b232ca4f03f16c2596aa34b428d69097db939e5776417a7d26f5a8508c8f0c1f1a5bf SHA512 df14500e2b27b6f39d9d4c4f42961efd63dfe25186e561eb1678952a8ab9311f17c36b78819fea33e0ac879c47a33d45c31ff58be017609c8a6157905ee712d6
24
25 diff --git a/dev-python/testrepository/files/testrepository-0.0.18-test-backport.patch b/dev-python/testrepository/files/testrepository-0.0.18-test-backport.patch
26 deleted file mode 100644
27 index 112b0299df5..00000000000
28 --- a/dev-python/testrepository/files/testrepository-0.0.18-test-backport.patch
29 +++ /dev/null
30 @@ -1,41 +0,0 @@
31 -diff --git a/testrepository/tests/test_repository.py b/testrepository/tests/test_repository.py
32 -index e2e5e05..4a8667b 100644
33 ---- a/testrepository/tests/test_repository.py
34 -+++ b/testrepository/tests/test_repository.py
35 -@@ -28,6 +28,7 @@
36 - from testresources import TestResource
37 - from testtools import (
38 - clone_test_with_new_id,
39 -+ content,
40 - PlaceHolder,
41 - )
42 - import testtools
43 -@@ -103,19 +104,24 @@ class Case(ResourcedTestCase):
44 - def passing(self):
45 - pass
46 -
47 -- def failing(self):
48 -- self.fail("oops")
49 --
50 - def unexpected_success(self):
51 - self.expectFailure("unexpected success", self.assertTrue, True)
52 -
53 -
54 -+class FailingCase:
55 -+
56 -+ def run(self, result):
57 -+ result.startTest(self)
58 -+ result.addError(
59 -+ self, None, details={'traceback': content.text_content("")})
60 -+ result.stopTest(self)
61 -+
62 - def make_test(id, should_pass):
63 - """Make a test."""
64 - if should_pass:
65 - case = Case("passing")
66 - else:
67 -- case = Case("failing")
68 -+ case = FailingCase()
69 - return clone_test_with_new_id(case, id)
70 -
71 -
72
73 diff --git a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
74 deleted file mode 100644
75 index 332e0dc0652..00000000000
76 --- a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
77 +++ /dev/null
78 @@ -1,49 +0,0 @@
79 -# Copyright 1999-2020 Gentoo Authors
80 -# Distributed under the terms of the GNU General Public License v2
81 -
82 -EAPI=5
83 -
84 -PYTHON_COMPAT=( python3_6 pypy3 )
85 -PYTHON_REQ_USE="threads(+)"
86 -
87 -inherit distutils-r1
88 -
89 -DESCRIPTION="A repository of test results"
90 -HOMEPAGE="https://launchpad.net/testscenarios"
91 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
92 -
93 -LICENSE="Apache-2.0"
94 -SLOT="0"
95 -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
96 -IUSE="test"
97 -RESTRICT="!test? ( test )"
98 -
99 -RDEPEND="
100 - >=dev-python/subunit-0.0.10[${PYTHON_USEDEP}]
101 - >=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
102 - dev-python/fixtures[${PYTHON_USEDEP}]"
103 -#bzr is listed but presumably req'd for a live repo test run
104 -
105 -DEPEND="
106 - dev-python/setuptools[${PYTHON_USEDEP}]
107 - test? ( ${RDEPEND}
108 - dev-python/testresources[${PYTHON_USEDEP}]
109 - dev-python/testscenarios[${PYTHON_USEDEP}]
110 - dev-python/pytz[${PYTHON_USEDEP}]
111 - )"
112 -
113 -# Required for test phase
114 -DISTUTILS_IN_SOURCE_BUILD=1
115 -
116 -PATCHES=(
117 - "${FILESDIR}"/${P}-test-backport.patch
118 - "${FILESDIR}"/${PN}-0.0.20-test-backport1.patch
119 -)
120 -
121 -python_test() {
122 - # some errors appear to have crept in the suite undert py3 since addition.
123 - # Python2.7 now passes all.
124 -
125 - ${PYTHON} testr init || die
126 - ${PYTHON} testr run || die
127 -}