From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 EEBA6158041 for ; Thu, 9 Sep 2021 17:29:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E896E0870; Thu, 9 Sep 2021 17:29:37 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 54AF6E0867 for ; Thu, 9 Sep 2021 17:29:36 +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 1234033BDF5 for ; Thu, 9 Sep 2021 17:29:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F33535 for ; Thu, 9 Sep 2021 17:29:33 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1631208533.9b44e5a66ec5f29c30962600ebf8b4bec6fd05e4.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/PyUtilib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/PyUtilib/PyUtilib-6.0.0.ebuild X-VCS-Directories: dev-python/PyUtilib/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 9b44e5a66ec5f29c30962600ebf8b4bec6fd05e4 X-VCS-Branch: master Date: Thu, 9 Sep 2021 17:29:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2ab18569-a608-4db0-9020-31b4bb97caa9 X-Archives-Hash: 7afaf72dc4c649db34c2e11b297eb482 commit: 9b44e5a66ec5f29c30962600ebf8b4bec6fd05e4 Author: Arthur Zamarin gentoo org> AuthorDate: Thu Sep 9 16:22:00 2021 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Thu Sep 9 17:28:53 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b44e5a6 dev-python/PyUtilib: enable py3.10, add missing deps Needed to fix a very small and irrelevant part of tests, which check exact output of --help output. In python 3.10 it changed the texts, so those fails are failing now. Fix by using sed and change only for python 3.10 the expected output. Closes: https://bugs.gentoo.org/812269 Signed-off-by: Arthur Zamarin gentoo.org> dev-python/PyUtilib/PyUtilib-6.0.0.ebuild | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild b/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild index d0f3e6c3885..fe1c027f23d 100644 --- a/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild +++ b/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild @@ -3,8 +3,7 @@ EAPI=7 -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_IN_SOURCE_BUILD=1 inherit distutils-r1 @@ -18,6 +17,9 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" +RDEPEND="dev-python/six[${PYTHON_USEDEP}]" +BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )" + PATCHES=( "${FILESDIR}/PyUtilib-6.0.0-tests.patch" ) @@ -36,5 +38,12 @@ python_test() { local -x PYTHONPATH="${PWD}:${TEST_DIR}/lib" \ COLUMNS=80 + if [[ ${EPYTHON} == python3.10 ]]; then + # Fix for very small output change of expected output in new version + sed -e 's/optional arguments/options/' -i \ + "${BUILD_DIR}/../doc/workflow/examples/"*.txt \ + pyutilib/misc/tests/test_config.py || die + fi + eunittest }