From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id OKqJJXzNOmQZQwEASxT56A (envelope-from ) for ; Sat, 15 Apr 2023 18:14:52 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id eHCJJHzNOmQYxwAAG6o9tA (envelope-from ) for ; Sat, 15 Apr 2023 18:14:52 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 59D7427C79 for ; Sat, 15 Apr 2023 18:14:52 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pniXX-0002nf-Fo; Sat, 15 Apr 2023 12:14:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pniXV-0002nV-FX for guix-devel@gnu.org; Sat, 15 Apr 2023 12:14:13 -0400 Received: from mail-40133.protonmail.ch ([185.70.40.133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pniXS-0007tq-W6 for guix-devel@gnu.org; Sat, 15 Apr 2023 12:14:13 -0400 Date: Sat, 15 Apr 2023 16:14:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1681575247; x=1681834447; bh=qQfCVBeyKgNu4GSg1ZXTrBvgJvPifpfoOH3HTtgfbXo=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=vkJiKXI7qTbGRim0LlTp5dvwT24xPuqINeWlMolfbIVhKRBG1c850Ijx8T6ZQhULP YrISw5IE2zwDFy7MDGYoInW3TWNtVVPV5K0eGATZ/LDiiB4bGSsXz8+OY4P5d6Z7if SlVBPzHpLply1HYIKd93o+vav0b2mWROLaek6i37A/XyhnLrUhoRzAOzV1tvth2pKH 1L6KwH/frbcVgfCI+mkXX8P5FR1xiBUHuvBR2sd1lNVqPxGKpK7ACJubBQkx/xaEMm UOFZrhCpLhpIbPOd3JqpIzkIOplDPlhiDung1Qd4IcvPM69n9ZW0s0sD1qrlf7Ex2+ qY2KoPDPDoN5Q== To: Josselin Poiret From: Kaelyn Cc: Andreas Enge , guix-devel Subject: Re: [PATCH core-updates] gnu: python-pytest: Fix failing test_raising_repr. Message-ID: In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.40.133; envelope-from=kaelyn.alexi@protonmail.com; helo=mail-40133.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1681575292; a=rsa-sha256; cv=none; b=OxBQcnpCt+TBMD4Uj4nL70ij3B6SRbOTbvzSQp5Dkdvv+qXOOHZvSBBtG4xsGmD4syh5YI PdRtqu0OoSaISBDR1wAH0UU/MasVQidzXtSP/nwIuL/9x7lXLcrYklOP6rq8Gzlmatl8Mb XYkMcAlAUgjUBkwvdudOWy/EikiVJUOwuNcyG5SlXBsZOxsgCpr4fifn92EcQNo3gfl0k/ /QNjK/lZnhOFYySTrlzcRA6SO8sWbh23GUHK2I79n2Fcmw90W7Vg5Qu+klA+KZjad0ytqf gqSQRHQFK93DDf7QlBnH1jGoqVpjuQ6UM9TBgpHGfUOUkLyoQtgAcIP1L92nSw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=protonmail.com header.s=protonmail3 header.b=vkJiKXI7; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=quarantine) header.from=protonmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1681575292; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=qQfCVBeyKgNu4GSg1ZXTrBvgJvPifpfoOH3HTtgfbXo=; b=jzXWaXylrZFhRO9FzGHxADNFpKvZM7bEgZ7BkMM/J1BQzAypIJbUV2eHxo66EGBvGV5RG7 dqpyykyKwDzLH779kk+E/KW/Qk27CLHZG9KuL2E2ItbSNVUE7xtymXfnW+2LMbm/lHZOyA 2lNoWm0/bE7gQprInDIQMAEnLsBl5cG3a864X11p+HhvfQ7qRhOkGcgG8nUpyUf/zWTjN7 KaIN7pzDiRSWlPLVs7G0nQwll+7uBVP6ihwy+CosLMmap55NrWhPeCH0z4O+T9Fr9onj+b KWsAx39NpYhRSZH96olpXBJ3WPfxIKXpGl+TU1JrE6b88f6tAlkHlYhD4eExOA== X-Migadu-Queue-Id: 59D7427C79 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=protonmail.com header.s=protonmail3 header.b=vkJiKXI7; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=quarantine) header.from=protonmail.com X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -6.44 X-Spam-Score: -6.44 X-TUID: oDKDoCEAG/i4 ------- Original Message ------- On Saturday, April 15th, 2023 at 2:08 PM, Josselin Poiret = wrote: >=20 > * gnu/packages/patches/pytest-fix-unstrable-exception-test.patch: Add new > patch from upstream. > * gnu/packages/check.scm (python-pytest): Use it. > * gnu/local.mk (dist_patch_DATA): Register it. > --- > Hey Andreas and Kaelyn, >=20 > This should also fix it without bumping python-pytest to a new version (s= ince it > has so many dependents, don't want to introduce new breakage now). >=20 > Best, > Josselin >=20 > gnu/local.mk | 1 + > gnu/packages/check.scm | 3 +- > .../pytest-fix-unstrable-exception-test.patch | 34 +++++++++++++++++++ > 3 files changed, 37 insertions(+), 1 deletion(-) > create mode 100644 gnu/packages/patches/pytest-fix-unstrable-exception-te= st.patch >=20 > diff --git a/gnu/local.mk b/gnu/local.mk > index e29e09b688..73756a8c49 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1730,6 +1730,7 @@ dist_patch_DATA =3D \ > %D%/packages/patches/pybugz-stty.patch \ > %D%/packages/patches/pygpgme-disable-problematic-tests.patch \ > %D%/packages/patches/pyqt-configure.patch \ > + %D%/packages/patches/pytest-fix-unstrable-exception-test.patch \ > %D%/packages/patches/python-2-deterministic-build-info.patch \ > %D%/packages/patches/python-2.7-adjust-tests.patch \ > %D%/packages/patches/python-2.7-expat-compat.patch \ > diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm > index f388eb82a7..d072edbf51 100644 > --- a/gnu/packages/check.scm > +++ b/gnu/packages/check.scm > @@ -1253,7 +1253,8 @@ (define-public python-pytest > (uri (pypi-uri "pytest" version)) > (sha256 > (base32 > - "0f8c31v5r2kgjixvy267n0nhc4xsy65g3n9lz1i1377z5pn5ydjg")))) > + "0f8c31v5r2kgjixvy267n0nhc4xsy65g3n9lz1i1377z5pn5ydjg")) > + (patches (search-patches "pytest-fix-unstrable-exception-test.patch")))= ) > (build-system python-build-system) > (arguments > (list > diff --git a/gnu/packages/patches/pytest-fix-unstrable-exception-test.pat= ch b/gnu/packages/patches/pytest-fix-unstrable-exception-test.patch > new file mode 100644 > index 0000000000..4d77786b77 > --- /dev/null > +++ b/gnu/packages/patches/pytest-fix-unstrable-exception-test.patch > @@ -0,0 +1,34 @@ > +From b55e264a675f7621b8351e227b93742f19e01c7d Mon Sep 17 00:00:00 2001 > +From: Daniel Valenzuela dsvalenzuela@uc.cl >=20 > +Date: Wed, 9 Nov 2022 19:43:10 -0300 > +Subject: [PATCH] Fix test_raising_repr test > + > +Closes #10473 > + > +Python <3.11 versions depend on `exceptiongroup>=3D1.0.0rc8`, and they r= eleased version `1.0.1` >=20 > +6 days ago (2022/11/03) that as a side-effect changed the output of exce= ptions. > +--- > + testing/test_assertion.py | 10 +--------- > + 1 file changed, 1 insertion(+), 9 deletions(-) > + > +diff --git a/testing/test_assertion.py b/testing/test_assertion.py > +index d8844f2e41..7574592210 100644 > +--- a/testing/test_assertion.py > ++++ b/testing/test_assertion.py > +@@ -1664,15 +1664,7 @@ def test_raising_repr(): > + """ > + ) > + result =3D pytester.runpytest() > +- if sys.version_info >=3D (3, 11): >=20 > +- # python 3.11 has native support for un-str-able exceptions > +- result.stdout.fnmatch_lines( > +- ["E AssertionError: "] >=20 > +- ) > +- else: > +- result.stdout.fnmatch_lines( > +- ["E AssertionError: "] >=20 > +- ) > ++ result.stdout.fnmatch_lines(["E AssertionError: "]) >=20 > + > + > + def test_issue_1944(pytester: Pytester) -> None: >=20 >=20 > base-commit: 7ccf9943029747d4ba97160214f895b365511278 > -- > 2.39.2 Hi Josselin, I just confirmed locally that the patch fixes the python-pytest test failur= e. Thank you for figuring out the failure! Cheers, Kaelyn