[gentoo-commits] repo/gentoo:master commit in: dev-python/testrepository/, profiles/, dev-python/os-testr/, ...

["Matthew Thode" <prometheanfire@gentoo.org>]

commit:     685d37705575a73b51b8c9cf0feaa4980b807c54
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  5 17:18:40 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Apr  5 17:19:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=685d3770

profiles/package.mask: remove os-testr and testrepository

Closes: https://bugs.gentoo.org/780021
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 dev-python/os-testr/Manifest                       |  1 -
 dev-python/os-testr/metadata.xml                   | 13 ----
 dev-python/os-testr/os-testr-2.0.0.ebuild          | 40 ------------
 dev-python/testrepository/Manifest                 |  1 -
 .../testrepository-0.0.20-test-backport.patch      | 71 ----------------------
 .../testrepository-0.0.20-test-backport1.patch     | 22 -------
 .../testrepository-0.0.20-test-backport2.patch     | 61 -------------------
 dev-python/testrepository/metadata.xml             | 16 -----
 .../testrepository/testrepository-0.0.20.ebuild    | 50 ---------------
 profiles/package.mask                              |  5 --
 10 files changed, 280 deletions(-)

diff --git a/dev-python/os-testr/Manifest b/dev-python/os-testr/Manifest
deleted file mode 100644
index fe0efc44a00..00000000000
--- a/dev-python/os-testr/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST os-testr-2.0.0.tar.gz 46787 BLAKE2B ff1b862c24d1f88d0794ad9139a0d57e6da5d57404ad3c659a18d84316b0cb603ec5c3455cf89fd12183dabc060537f6b077cd09a9fe1f785c6cd56fc0c596b4 SHA512 0ee6a144a75f7742aaf6859161f7918fb908a6783180a022a8698ce4dffeac50bf453c208b47ec784687d88a55739fff822483f404f246f222c24245ed6845ea

diff --git a/dev-python/os-testr/metadata.xml b/dev-python/os-testr/metadata.xml
deleted file mode 100644
index 47721b633ef..00000000000
--- a/dev-python/os-testr/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">os-testr</remote-id>
-		<remote-id type="github">openstack/os-testr</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/dev-python/os-testr/os-testr-2.0.0.ebuild b/dev-python/os-testr/os-testr-2.0.0.ebuild
deleted file mode 100644
index c812c1aa60d..00000000000
--- a/dev-python/os-testr/os-testr-2.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A testr wrapper to provide functionality for OpenStack projects"
-HOMEPAGE="https://pypi.org/project/os-testr/ https://github.com/openstack/os-testr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? ( ${RDEPEND}
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.1[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}

diff --git a/dev-python/testrepository/Manifest b/dev-python/testrepository/Manifest
deleted file mode 100644
index 013694ad922..00000000000
--- a/dev-python/testrepository/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST testrepository-0.0.20.tar.gz 84956 BLAKE2B 9b9a8e0c21754fe8ba019b58024f137e72b4341cb368fb48dc48039f512b232ca4f03f16c2596aa34b428d69097db939e5776417a7d26f5a8508c8f0c1f1a5bf SHA512 df14500e2b27b6f39d9d4c4f42961efd63dfe25186e561eb1678952a8ab9311f17c36b78819fea33e0ac879c47a33d45c31ff58be017609c8a6157905ee712d6

diff --git a/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch b/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch
deleted file mode 100644
index 7622c0abfa4..00000000000
--- a/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 8f8ab15fafdad6db850c84772323b32375b09285 Mon Sep 17 00:00:00 2001
-From: Robert Collins <robertc@robertcollins.net>
-Date: Tue, 10 Mar 2015 15:21:49 +1300
-Subject: [PATCH] Fixup tests with latest testtools.
-
-Testtools has started chunking exceptions (which is perhaps good,
-perhaps bad) - but we shouldn't depend on the exact behaviour in it
-for our tests.
----
- NEWS                                    |  6 ++++++
- testrepository/tests/test_repository.py | 14 ++++++++++----
- 2 files changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index e258b11..536308c 100644
---- a/NEWS
-+++ b/NEWS
-@@ -5,6 +5,12 @@ testrepository release notes
- NEXT (In development)
- +++++++++++++++++++++
- 
-+CHANGES
-+-------
-+
-+* Isolate the testrepository test suite from the chunking (or otherwise)
-+  behaviour of testtools' exception handlers. (Robert Collins)
-+
- 0.0.20
- ++++++
- 
-diff --git a/testrepository/tests/test_repository.py b/testrepository/tests/test_repository.py
-index e2e5e05..4a8667b 100644
---- a/testrepository/tests/test_repository.py
-+++ b/testrepository/tests/test_repository.py
-@@ -28,6 +28,7 @@
- from testresources import TestResource
- from testtools import (
-     clone_test_with_new_id,
-+    content,
-     PlaceHolder,
-     )
- import testtools
-@@ -103,19 +104,24 @@ class Case(ResourcedTestCase):
-     def passing(self):
-         pass
- 
--    def failing(self):
--        self.fail("oops")
--
-     def unexpected_success(self):
-         self.expectFailure("unexpected success", self.assertTrue, True)
- 
- 
-+class FailingCase:
-+
-+    def run(self, result):
-+        result.startTest(self)
-+        result.addError(
-+            self, None, details={'traceback': content.text_content("")})
-+        result.stopTest(self)
-+
- def make_test(id, should_pass):
-     """Make a test."""
-     if should_pass:
-         case = Case("passing")
-     else:
--        case = Case("failing")
-+        case = FailingCase()
-     return clone_test_with_new_id(case, id)
- 
- 

diff --git a/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch b/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch
deleted file mode 100644
index 193b91e1cd3..00000000000
--- a/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d3d6cac4fd42f2067c0dd81be748853f81c348fc Mon Sep 17 00:00:00 2001
-From: Robert Collins <robertc@robertcollins.net>
-Date: Sun, 12 Jul 2015 21:37:34 +1200
-Subject: [PATCH] Fix 3.3+ tests with nested classnames.
-
----
- testrepository/tests/ui/test_cli.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testrepository/tests/ui/test_cli.py b/testrepository/tests/ui/test_cli.py
-index 9ba11ad..e1f9b44 100644
---- a/testrepository/tests/ui/test_cli.py
-+++ b/testrepository/tests/ui/test_cli.py
-@@ -157,7 +157,7 @@ def method(self):
-         self.assertThat(ui._stdout.buffer.getvalue().decode('utf8'),
-             DocTestMatches("""\
- ======================================================================
--FAIL: testrepository.tests.ui.test_cli.Case.method
-+FAIL: testrepository.tests.ui.test_cli...Case.method
- ----------------------------------------------------------------------
- ...Traceback (most recent call last):...
-   File "...test_cli.py", line ..., in method

diff --git a/dev-python/testrepository/files/testrepository-0.0.20-test-backport2.patch b/dev-python/testrepository/files/testrepository-0.0.20-test-backport2.patch
deleted file mode 100644
index a0614b671e1..00000000000
--- a/dev-python/testrepository/files/testrepository-0.0.20-test-backport2.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From e2f84ae6b2bcf89221613056d0c45dd308f46d62 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@jelmer.uk>
-Date: Thu, 5 Apr 2018 01:02:40 +0100
-Subject: [PATCH] Fix the testrepository tests with newer versions of
- testtools.
-
----
- testrepository/tests/commands/test_failing.py | 2 +-
- testrepository/tests/test_repository.py       | 7 ++++---
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/testrepository/tests/commands/test_failing.py b/testrepository/tests/commands/test_failing.py
-index 56c97ef..4e52f6a 100644
---- a/testrepository/tests/commands/test_failing.py
-+++ b/testrepository/tests/commands/test_failing.py
-@@ -90,7 +90,7 @@ class TestCommand(ResourcedTestCase):
-         finally:
-             log.stopTestRun()
-         self.assertEqual(
--            log._events, [
-+            [tuple(ev) for ev in log._events], [
-             ('startTestRun',),
-             ('status', 'failing', 'inprogress', None, True, None, None, False,
-              None, None, Wildcard),
-diff --git a/testrepository/tests/test_repository.py b/testrepository/tests/test_repository.py
-index 4a8667b..28d99bc 100644
---- a/testrepository/tests/test_repository.py
-+++ b/testrepository/tests/test_repository.py
-@@ -113,9 +113,10 @@ class FailingCase:
-     def run(self, result):
-         result.startTest(self)
-         result.addError(
--            self, None, details={'traceback': content.text_content("")})
-+            self, None, details={'traceback': content.text_content("tb")})
-         result.stopTest(self)
- 
-+
- def make_test(id, should_pass):
-     """Make a test."""
-     if should_pass:
-@@ -409,7 +410,7 @@ class TestRepositoryContract(ResourcedTestCase):
-         finally:
-             log.stopTestRun()
-         self.assertEqual(
--            log._events, [
-+            [tuple(ev) for ev in log._events], [
-             ('startTestRun',),
-             ('status',
-              'testrepository.tests.test_repository.Case.method',
-@@ -465,7 +466,7 @@ class TestRepositoryContract(ResourcedTestCase):
-         finally:
-             log.stopTestRun()
-         self.assertEqual(
--            log._events,
-+            [tuple(ev) for ev in log._events],
-             [
-             ('startTestRun',),
-             ('status',
--- 
-2.18.0
-

diff --git a/dev-python/testrepository/metadata.xml b/dev-python/testrepository/metadata.xml
deleted file mode 100644
index 14e15bee946..00000000000
--- a/dev-python/testrepository/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>openstack@gentoo.org</email>
-		<name>Openstack</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">testrepository</remote-id>
-		<remote-id type="launchpad">testscenarios</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/dev-python/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild
deleted file mode 100644
index aa9c278a133..00000000000
--- a/dev-python/testrepository/testrepository-0.0.20.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A repository of test results"
-HOMEPAGE="https://launchpad.net/testscenarios"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
-	dev-python/fixtures[${PYTHON_USEDEP}]"
-#bzr is listed but presumably req'd for a live repo test run
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/testresources[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-# Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-backport.patch
-	"${FILESDIR}"/${P}-test-backport1.patch
-	"${FILESDIR}"/${P}-test-backport2.patch
-)
-
-python_test() {
-	# some errors appear to have crept in the suite undert py3 since addition.
-	# Python2.7 now passes all.
-
-	${PYTHON} testr init || die
-	${PYTHON} testr run || die
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index e23583d5e45..bc7fb581181 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -50,11 +50,6 @@ sci-biology/gatk
 # Bug #625492, removal in 30 days.
 sci-biology/diya
 
-# Matthew Thode <mthode@mthode.org> (2021-04-04)
-# Removing more unneeded openstack packages
-dev-python/testrepository
-dev-python/os-testr
-
 # Michał Górny <mgorny@gentoo.org> (2021-04-04)
 # Reported to contain an unintentional ABI breakage leading to crashes
 # when loading extensions on 32-bit systems.