From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id e3EyCB9dyV+5cQAA0tVLHw (envelope-from ) for ; Thu, 03 Dec 2020 21:48:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id mOWNAx9dyV+CRgAAbx9fmQ (envelope-from ) for ; Thu, 03 Dec 2020 21:48:15 +0000 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 C88B4940858 for ; Thu, 3 Dec 2020 21:48:14 +0000 (UTC) Received: from localhost ([::1]:35420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkwST-0000zQ-No for larch@yhetil.org; Thu, 03 Dec 2020 16:48:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkwSI-0000xN-Ly for guix-patches@gnu.org; Thu, 03 Dec 2020 16:48:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58674) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kkwSI-0003Bl-Ef for guix-patches@gnu.org; Thu, 03 Dec 2020 16:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kkwSI-0007ix-Bm for guix-patches@gnu.org; Thu, 03 Dec 2020 16:48:02 -0500 Subject: bug#45003: [PATCH] gnu: poetry: Fix a problem with a dependency. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Thu, 03 Dec 2020 21:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 45003 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Tanguy Le Carrour , 45003-done@debbugs.gnu.org Cc: Tanguy Le Carrour Mail-Followup-To: 45003@debbugs.gnu.org, marius@gnu.org, tanguy@bioneland.org Received: via spool by 45003-done@debbugs.gnu.org id=D45003.160703205529651 (code D ref 45003); Thu, 03 Dec 2020 21:48:02 +0000 Received: (at 45003-done) by debbugs.gnu.org; 3 Dec 2020 21:47:35 +0000 Received: from localhost ([127.0.0.1]:41986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkwRq-0007iB-T0 for submit@debbugs.gnu.org; Thu, 03 Dec 2020 16:47:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkwRp-0007hz-8r for 45003-done@debbugs.gnu.org; Thu, 03 Dec 2020 16:47:33 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:52394) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkwRj-000337-CJ; Thu, 03 Dec 2020 16:47:27 -0500 Received: from host-37-191-236-253.lynet.no ([37.191.236.253]:39026 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kkwRi-0005pS-L0; Thu, 03 Dec 2020 16:47:27 -0500 From: Marius Bakke In-Reply-To: <20201202083354.19350-1-tanguy@bioneland.org> References: <20201202083354.19350-1-tanguy@bioneland.org> Date: Thu, 03 Dec 2020 22:47:23 +0100 Message-ID: <87o8jaimtw.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.88 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C88B4940858 X-Spam-Score: -4.88 X-Migadu-Scanner: ns3122888.ip-94-23-21.eu X-TUID: UqXcKId0kIvD --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Tanguy Le Carrour skriver: > * gnu/packages/python-xyz.scm (poetry)[arguments]: Relax version constraints > for python-packaging. Applied, thanks! Note: I tried to do this: --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=diff Content-Transfer-Encoding: quoted-printable diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bffb643258..ce4695a956 100644 =2D-- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16003,17 +16003,15 @@ several utilities, as well as an API for building= localization tools.") (define-public python-packaging (package (name "python-packaging") =2D (version "20.0") =2D (source =2D (origin =2D (method url-fetch) =2D (uri (pypi-uri "packaging" version)) =2D ;; XXX: The URL in the patch file is wrong, it should be =2D ;; . =2D (patches (search-patches "python-packaging-test-arch.patch")) =2D (sha256 =2D (base32 =2D "1y2ip3a4ykkpgnwgn85j6hkspcl0cg3mzms97f40mk57vwqq67gy")))) + ;; Note: when updating this, be careful not to change the 'bootstrap' + ;; variant below, which can only be updated on 'core-updates'. + (version "20.4") + (source (origin + (method url-fetch) + (uri (pypi-uri "packaging" version)) + (sha256 + (base32 + "1y3rc1ams1i25calk6b9jf1gl85ix5a23a146swjvhdr8x7zfms3")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -16046,25 +16044,26 @@ information.") ;; Variants with minimal dependencies, for bootstrapping Pytest. (define-public python-packaging-bootstrap (hidden-package =2D (package/inherit =2D python-packaging =2D (name "python-packaging-bootstrap") =2D (native-inputs '()) =2D (propagated-inputs =2D `(("python-pyparsing" ,python-pyparsing))) =2D (arguments '(#:tests? #f))))) + (package + (inherit python-packaging) + (version "20.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "packaging" version)) + ;; XXX: The URL in the patch file is wrong, it should be + ;; . + (patches (search-patches "python-packaging-test-arch.patch"= )) + (sha256 + (base32 + "1y2ip3a4ykkpgnwgn85j6hkspcl0cg3mzms97f40mk57vwqq67gy")))) + (name "python-packaging-bootstrap") + (native-inputs '()) + (propagated-inputs + `(("python-pyparsing" ,python-pyparsing))) + (arguments '(#:tests? #f))))) =20 (define-public python2-packaging-bootstrap =2D (hidden-package =2D (package/inherit =2D python2-packaging =2D (name "python2-packaging-bootstrap") =2D (native-inputs '()) =2D (propagated-inputs =2D `(("python-pyparsing" ,python2-pyparsing))) =2D (arguments =2D `(#:tests? #f =2D ,@(package-arguments python2-packaging)))))) + (package-with-python2 python-packaging-bootstrap)) =20 (define-public python-relatorio (package --=-=-= Content-Type: text/plain But the test suite actually picks the 'python-packaging' that is propagated from 'pytest', and promptly fails. Updating packaging alone is also a staging-level change, so I did not dig much further. But there is some room for improvement here. Maybe by (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH"))) ? I also wonder whether pytest needs to propagate packaging at all, or if wrapping is enough. Do you know how common it is to "import pytest" or "from pytest import foo", and whether those code paths would need 'packaging'? Anyway, future problems! Thanks for maintaining Poetry. :-) --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFDBAEBCgAtFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl/JXOsPHG1hcml1c0Bn bnUub3JnAAoJEKKgbfKjOlT6ARYIAJNi2/8KUvCDKQVwO1pYEe0LkRFs/9gJtR1b Vlb3f5wRPLhG2U8sYb8ge93Pp0fNDeE6dxGTGa4ATZ0Z4wTtrLfPU7fXpEk8C+tM awZ0LVSzv54N7/Z146bcRdkW1cqvKOE0qmZKS6XlRrO6YX/IV0+Kml5CHJ27BmEP +yellSh/fK+SnQf7hqvmuHyuhFjHIQt8n3nx1PZDKyHsfq/O0HJhXMTvqJr58qDn fklxQw8QcHozO2wZGFTcUNabmsXIzpwRnZKoHsx9HyvNGcvb7s2hLyixlRY6q4T0 3sLTTE78oT5uIWgK7dCovUBapjJccFU2U0Yx8Ozfdxnqogi6Rb4= =QILR -----END PGP SIGNATURE----- --==-=-=--