From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1301486-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 049D713933E
for <garchives@archives.gentoo.org>; Mon, 12 Jul 2021 03:14:14 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 557A4E0EFD;
Mon, 12 Jul 2021 03:14:13 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 9514DE0EFD
for <gentoo-commits@lists.gentoo.org>; Mon, 12 Jul 2021 03:14:12 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1F2D2342BA4
for <gentoo-commits@lists.gentoo.org>; Mon, 12 Jul 2021 03:14:11 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7A3A55C4
for <gentoo-commits@lists.gentoo.org>; Mon, 12 Jul 2021 03:14:09 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1626059632.3be57e9c52fe2103d46ff42c8e5b4d048b09217e.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/testtools/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/testtools/testtools-2.4.0-r2.ebuild
X-VCS-Directories: dev-python/testtools/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 3be57e9c52fe2103d46ff42c8e5b4d048b09217e
X-VCS-Branch: master
Date: Mon, 12 Jul 2021 03:14:09 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 096ae2a8-c384-4866-8043-9beb3c14ecab
X-Archives-Hash: f6c2b46d9cc4f249900a9ec400cba40c
commit: 3be57e9c52fe2103d46ff42c8e5b4d048b09217e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 12 03:12:13 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 12 03:13:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3be57e9c
dev-python/testtools: drop back to EAPI 7 to ease upgrades
This causes an issue because of the following depchain:
samba -> subunit -> testtools (EAPI 8 only)
While we should try drop the subunit dependency from Samba if possible,
let's drop testtools back to EAPI 7 temporarily to ease upgrades
for users, given Samba is a very common package (and even dependency).
Bug: https://bugs.gentoo.org/801637
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-python/testtools/testtools-2.4.0-r2.ebuild | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dev-python/testtools/testtools-2.4.0-r2.ebuild b/dev-python/testtools/testtools-2.4.0-r2.ebuild
index fdc73ff2db9..7f2830ce2d4 100644
--- a/dev-python/testtools/testtools-2.4.0-r2.ebuild
+++ b/dev-python/testtools/testtools-2.4.0-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=8
+EAPI=7
PYTHON_COMPAT=( python3_{8..10} pypy3 )
PYTHON_REQ_USE="threads(+)"
@@ -43,6 +43,10 @@ distutils_enable_tests unittest
src_prepare() {
# eliminate unittest2 & traceback2
sed -i -e '/unittest2/d' -e '/traceback2/d' requirements.txt || die
+ # eliminate linecache2
+ sed -i -e 's/import linecache2 as linecache/import linecache/' \
+ testtools/tests/test_compat.py || die
+
# also conditional imports
find -name '*.py' -exec \
sed -i -e 's:unittest2:unittest:' {} + || die