From unknown Sat Sep 13 00:10:58 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#46866 <46866@debbugs.gnu.org> To: bug#46866 <46866@debbugs.gnu.org> Subject: Status: [PATCH] gnu: b4: Fix setup.py version incompatibility. Reply-To: bug#46866 <46866@debbugs.gnu.org> Date: Sat, 13 Sep 2025 07:10:58 +0000 retitle 46866 [PATCH] gnu: b4: Fix setup.py version incompatibility. reassign 46866 guix-patches submitter 46866 Kyle Meyer severity 46866 normal tag 46866 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 01 20:52:30 2021 Received: (at submit) by debbugs.gnu.org; 2 Mar 2021 01:52:30 +0000 Received: from localhost ([127.0.0.1]:51280 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lGuD7-0007vu-M9 for submit@debbugs.gnu.org; Mon, 01 Mar 2021 20:52:29 -0500 Received: from lists.gnu.org ([209.51.188.17]:45838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lGuD5-0007vm-Ea for submit@debbugs.gnu.org; Mon, 01 Mar 2021 20:52:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGuCy-0000ew-4q for guix-patches@gnu.org; Mon, 01 Mar 2021 20:52:23 -0500 Received: from out1.migadu.com ([91.121.223.63]:21325) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGuCu-0005Qu-GS for guix-patches@gnu.org; Mon, 01 Mar 2021 20:52:19 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1614649931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=N8KoGztTlvWMOR8O8hCS0IAGnpBf9ejzHmUlbIoEdV0=; b=YJYhmEhbB7tJ+MuprL/gHmJnMnEGrAa7UfovhqVHsIDZhbLIdezLSjFxzadSvrw75v6t69 bPqb/I6ooWWNL/XTnuQ4ufgSjUBk/CkDt9fA2UUVj9T6n3uMAQUUEMIRGfd+DpKD5SnyzM IUXKJ3Sgy4qaHliL5GiTomdishaoLGNHO7IpBA3kKZQ4unBYqKYJpejm7s3cpqUFnVL3hf M1CU6ddYZquGwHrva7A9spqYB3RcCjzd6bE0kD782ShkvpGitJ3rXJ3Af/0IvvRxK/rw72 bKO/d5KbLAnzbxtRcyBjjnHohCObsybd+CoV7qZKiCvbyUcmm6QUA6O2zwiX7g== From: Kyle Meyer To: guix-patches@gnu.org Subject: [PATCH] gnu: b4: Fix setup.py version incompatibility. Date: Mon, 1 Mar 2021 20:51:58 -0500 Message-Id: <20210302015158.16177-1-kyle@kyleam.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: kyle@kyleam.com Received-SPF: pass client-ip=91.121.223.63; envelope-from=kyle@kyleam.com; helo=out1.migadu.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Following the update of python-requests to 2.25.0, b4 fails at runtime with a pkg_resources.ContextualVersionConflict exception. This has been addressed upstream. Temporarily apply the upstream fix. * gnu/packages/patches/b4-loosen-version-identifiers.patch: New patch. * gnu/packages/version-control.scm (b4): Apply it. --- .../b4-loosen-version-identifiers.patch | 44 +++++++++++++++++++ gnu/packages/version-control.scm | 3 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/b4-loosen-version-identifiers.patch diff --git a/gnu/packages/patches/b4-loosen-version-identifiers.patch b/gnu/packages/patches/b4-loosen-version-identifiers.patch new file mode 100644 index 0000000000..5ae5865274 --- /dev/null +++ b/gnu/packages/patches/b4-loosen-version-identifiers.patch @@ -0,0 +1,44 @@ +From e66d514b4113fffc81e48c7c531dcf148ba8b8e8 Mon Sep 17 00:00:00 2001 +From: Kyle Meyer +Date: Thu, 25 Feb 2021 23:25:57 -0500 +Subject: Loosen compatible release identifiers for install_requires + +The install_requires entries use a compatible release operator. As an +example, "requests~=2.24.0" maps to a requirement of ">= 2.24.0 and == +2.24.*". With the current version of requests (2.25.1), this leads to +a ContextualVersionConflict failure at runtime. + +Allowing only Z to tick in version X.Y.Z seems unnecessarily strict +unless there are known problems with a particular release, and it +makes it more difficult for distributions to package b4. Drop the +trailing digit from all of the version identifiers, allowing both Y +and Z to increase. + +Signed-off-by: Kyle Meyer +Signed-off-by: Konstantin Ryabitsev +--- + This patch was taken from the upstream repository and will be included in + the next release. + + https://git.kernel.org/pub/scm/utils/b4/b4.git/patch/?id=e66d514b4113fffc81e48c7c531dcf148ba8b8e8 + + setup.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index 358e6a7..a21ec76 100644 +--- a/setup.py ++++ b/setup.py +@@ -41,9 +41,9 @@ setup( + data_files = [('share/man/man5', ['man/b4.5'])], + keywords=['git', 'lore.kernel.org', 'patches'], + install_requires=[ +- 'requests~=2.24.0', +- 'dkimpy~=1.0.5', +- 'dnspython~=2.0.0', ++ 'requests~=2.24', ++ 'dkimpy~=1.0', ++ 'dnspython~=2.0', + ], + python_requires='>=3.6', + entry_points={ diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 3afb06ca79..2fb8fa821f 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2347,7 +2347,8 @@ (define-public b4 (method url-fetch) (uri (pypi-uri "b4" version)) (sha256 - (base32 "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z")))) + (base32 "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z")) + (patches (search-patches "b4-loosen-version-identifiers.patch")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; No tests. (inputs base-commit: 4bc9a1f4e3bd39302b4ceaab8589a2e6ef82c4bd -- 2.31.0.rc0.254.gbdcc3b1a9d From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 09 03:10:24 2021 Received: (at 46866) by debbugs.gnu.org; 9 Mar 2021 08:10:24 +0000 Received: from localhost ([127.0.0.1]:45540 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJXRY-0000fy-F0 for submit@debbugs.gnu.org; Tue, 09 Mar 2021 03:10:24 -0500 Received: from flashner.co.il ([178.62.234.194]:43908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJXRX-0000fj-DK for 46866@debbugs.gnu.org; Tue, 09 Mar 2021 03:10:16 -0500 Received: from localhost (unknown [31.210.181.184]) by flashner.co.il (Postfix) with ESMTPSA id 491F14020F; Tue, 9 Mar 2021 08:10:09 +0000 (UTC) Date: Tue, 9 Mar 2021 10:09:35 +0200 From: Efraim Flashner To: Kyle Meyer Subject: Re: [bug#46866] [PATCH] gnu: b4: Fix setup.py version incompatibility. Message-ID: References: <20210302015158.16177-1-kyle@kyleam.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="uXDqZ/Zd0YR47bTr" Content-Disposition: inline In-Reply-To: <20210302015158.16177-1-kyle@kyleam.com> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 46866 Cc: 46866@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --uXDqZ/Zd0YR47bTr Content-Type: multipart/mixed; boundary="Y7FJMawKeU7NSi3X" Content-Disposition: inline --Y7FJMawKeU7NSi3X Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Indeed, it does fail at startup. Two things about your patch, you've added a patch file but didn't register it in gnu/local.mk. This means it'll get dropped during a 'make dist' which would be a problem. The second is that it's a lot of patch for a small amount of code change. With your permission I'd like to commit the attached patch instead. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --Y7FJMawKeU7NSi3X Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-b4-Fix-setup.py-version-incompatibility.patch" Content-Transfer-Encoding: quoted-printable =46rom 9b0187ac1e28edb987cb5b76c4c3ae8330bcf7eb Mon Sep 17 00:00:00 2001 =46rom: Kyle Meyer Date: Tue, 9 Mar 2021 10:06:13 +0200 Subject: [PATCH] gnu: b4: Fix setup.py version incompatibility. * gnu/packages/version-control.scm (b4)[source]: Add snippet to not require too specific of a version. Co-authored with Efraim Flashner Signed-off-by: Efraim Flashner --- gnu/packages/version-control.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-contro= l.scm index 8292a5df15..4051efed9c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -7,7 +7,7 @@ ;;; Copyright =C2=A9 2014, 2015, 2016 Mark H Weaver ;;; Copyright =C2=A9 2014, 2016, 2019 Eric Bavier ;;; Copyright =C2=A9 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flash= ner -;;; Copyright =C2=A9 2015, 2018, 2020 Kyle Meyer +;;; Copyright =C2=A9 2015, 2018, 2020, 2021 Kyle Meyer ;;; Copyright =C2=A9 2015, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright =C2=A9 2016, 2017 Leo Famulari ;;; Copyright =C2=A9 2016, 2017, 2018 Nikita @@ -2347,7 +2347,15 @@ based on a manifest file published by servers.") (method url-fetch) (uri (pypi-uri "b4" version)) (sha256 - (base32 "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z")))) + (base32 "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fixes issue with dependency requirements being too strict. S= ee upstream commit: + ;; https://git.kernel.org/pub/scm/utils/b4/b4.git/commit/?id=3D= 31348a14afdb1d39e7faf9576eaddea1ced76e19 + (substitute* "setup.py" + (("\\.0'") "'")) + #t)))) (build-system python-build-system) (arguments '(#:tests? #f)) ; No tests. (inputs --=20 2.30.1 --Y7FJMawKeU7NSi3X-- --uXDqZ/Zd0YR47bTr Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmBHLT8ACgkQQarn3Mo9 g1F4zhAAqNFLXWsx4Rk//pk4ivzZv70XfH4PtxK2fEUeA0EN+XWRGm/6y9/0KsPh +RbpnSlgDMEmBiui2bQKu5TRj/1Nc5n2aqDgV5HOVN32GvaJkoTuUMM6KRCT7jQx vSnVazhVFLWNdwUiaNcZ7+DXwF4m2wUh0kHZ3U2Btv9L03KZNw//2hdEv/cmDo2E ARelTIi7yQtvah2v6Abcol/btyPQrty50cVNOCTFEJNXrXXaexqe4AuQpJiBHimz eugtQdN9hXfTciWUUZ+MsGJa/xk63p2q2n3lT5pf3ZcdqvWBKB03GVTjNpOaaIWj aXy8QGMlsXYuzCkyh7S9yf1b4CpY5gnDLeq72UYknl516huD74WXwecKhxB6ihVj SCkWcjhr0K2nU5NiOMBIYGJ2TpOsg+qn0sDFWmNxt7iz1eeVg1vXReGojGDxQYuC y+xia6FJUVtaHhhcsG5BSVKv4kSu8zeG4aphVC/OrMrM1uq6jLD2MIN1MFlnsIwJ P2dT2r6gFimevuIPgRUoBKn5124AUiNx1+OMHxxZjRrcNC2GJqgOQ98z5Q7gxXBE geDRDzowuFdhlpOKzkpHCFGU5kyFvE5og6x423rNqrEF3JWWbtuMQOXT3ERapb4E SiRynQ9leinC6jvXzMA39gndcVefXW/V7jP+Cy9bVo+ov+ks3c4= =quQA -----END PGP SIGNATURE----- --uXDqZ/Zd0YR47bTr-- From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 09 17:54:11 2021 Received: (at 46866) by debbugs.gnu.org; 9 Mar 2021 22:54:11 +0000 Received: from localhost ([127.0.0.1]:48202 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJlEw-0001wR-SP for submit@debbugs.gnu.org; Tue, 09 Mar 2021 17:54:11 -0500 Received: from out1.migadu.com ([91.121.223.63]:64366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJlEu-0001wH-8Z for 46866@debbugs.gnu.org; Tue, 09 Mar 2021 17:54:10 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1615330446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=8VkK9dMH+Gh1RrJJHTc7pM8GrOh3dXwSv8pv3pgJs7o=; b=BDr7sXVhcHy7XuGmLxOp5EaG/xGo/qvSAu9VXLMAl7sEH/vngCdcXfIL6c9Ildjcnn5iuM 6mJpt+Kmzh+P9WVhGB2x8lFGBXKlbgmOCJaxA9DraqzMwePracNnUAmX93fxStmsPDfn87 soUTv37c4rhJL9UP0WyfXOvv0hFUan3odWD8FQiUXgC2kaTEHRThKPTZRnYiESCyw3ptX/ 9xmUg5qkt+wAgZ7MTumvGjiztPQa1g2BV9wSBSJj/EABJM4EdJFtH9sTR2tKCZ8nAXvCRe fz3kDuEeUaQf121B043BpfdcpYHbV14TkR3a0VN4aI66+5NEf7+WKi3zm2923Q== From: Kyle Meyer To: Efraim Flashner Subject: Re: [bug#46866] [PATCH] gnu: b4: Fix setup.py version incompatibility. In-Reply-To: References: <20210302015158.16177-1-kyle@kyleam.com> Date: Tue, 09 Mar 2021 17:54:04 -0500 Message-ID: <87wnugym43.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: kyle@kyleam.com X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 46866 Cc: 46866@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Efraim Flashner writes: > Indeed, it does fail at startup. Two things about your patch, you've > added a patch file but didn't register it in gnu/local.mk. This means > it'll get dropped during a 'make dist' which would be a problem. Doh, thanks for catching that. > The second is that it's a lot of patch for a small amount of code > change. I like that a patch fails loudly once it's no longer valid, but I'm happy to defer to your opinion that it's an overkill here (and will try to recalibrate for future patches). > With your permission I'd like to commit the attached patch instead. [...] > From: Kyle Meyer > Date: Tue, 9 Mar 2021 10:06:13 +0200 > Subject: [PATCH] gnu: b4: Fix setup.py version incompatibility. > > * gnu/packages/version-control.scm (b4)[source]: Add snippet to not > require too specific of a version. > > Co-authored with Efraim Flashner > > Signed-off-by: Efraim Flashner Sounds fine to me. I have a slight preference that you put yourself as the author and put a Noticed-by: Kyle Meyer or Reported-by: Kyle Meyer trailer for me, but either way is okay. > @@ -2347,7 +2347,15 @@ based on a manifest file published by servers.") > (method url-fetch) > (uri (pypi-uri "b4" version)) > (sha256 > - (base32 "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z")))) > + (base32 "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z")) > + (modules '((guix build utils))) > + (snippet > + '(begin > + ;; Fixes issue with dependency requirements being too strict. See upstream commit: > + ;; https://git.kernel.org/pub/scm/utils/b4/b4.git/commit/?id=31348a14afdb1d39e7faf9576eaddea1ced76e19 > + (substitute* "setup.py" > + (("\\.0'") "'")) Just a note: This won't catch a similar problem if dkimpy (1.0.5) is upgraded before b4, though perhaps that's unlikely and not worth worrying about. Thank you for the review. From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 16 08:31:08 2021 Received: (at 46866-done) by debbugs.gnu.org; 16 Mar 2021 12:31:10 +0000 Received: from localhost ([127.0.0.1]:38405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM8qe-0004bL-Hq for submit@debbugs.gnu.org; Tue, 16 Mar 2021 08:31:06 -0400 Received: from flashner.co.il ([178.62.234.194]:54244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM8qI-0004Wq-7I for 46866-done@debbugs.gnu.org; Tue, 16 Mar 2021 08:30:46 -0400 Received: from localhost (unknown [31.210.181.184]) by flashner.co.il (Postfix) with ESMTPSA id A1A6D40478; Tue, 16 Mar 2021 12:30:27 +0000 (UTC) Date: Tue, 16 Mar 2021 14:29:49 +0200 From: Efraim Flashner To: Kyle Meyer Subject: Re: [bug#46866] [PATCH] gnu: b4: Fix setup.py version incompatibility. Message-ID: References: <20210302015158.16177-1-kyle@kyleam.com> <87wnugym43.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ayJS2/MbsUNiq/8U" Content-Disposition: inline In-Reply-To: <87wnugym43.fsf@kyleam.com> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 46866-done Cc: 46866-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --ayJS2/MbsUNiq/8U Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Mar 09, 2021 at 05:54:04PM -0500, Kyle Meyer wrote: > Efraim Flashner writes: >=20 > > Indeed, it does fail at startup. Two things about your patch, you've > > added a patch file but didn't register it in gnu/local.mk. This means > > it'll get dropped during a 'make dist' which would be a problem. >=20 > Doh, thanks for catching that. >=20 > > The second is that it's a lot of patch for a small amount of code > > change. >=20 > I like that a patch fails loudly once it's no longer valid, but I'm > happy to defer to your opinion that it's an overkill here (and will try > to recalibrate for future patches). >=20 > > With your permission I'd like to commit the attached patch instead. > [...] > > From: Kyle Meyer > > Date: Tue, 9 Mar 2021 10:06:13 +0200 > > Subject: [PATCH] gnu: b4: Fix setup.py version incompatibility. > > > > * gnu/packages/version-control.scm (b4)[source]: Add snippet to not > > require too specific of a version. > > > > Co-authored with Efraim Flashner > > > > Signed-off-by: Efraim Flashner >=20 > Sounds fine to me. I have a slight preference that you put yourself as > the author and put a >=20 > Noticed-by: Kyle Meyer >=20 > or >=20 > Reported-by: Kyle Meyer >=20 > trailer for me, but either way is okay. >=20 > > @@ -2347,7 +2347,15 @@ based on a manifest file published by servers.") > > (method url-fetch) > > (uri (pypi-uri "b4" version)) > > (sha256 > > - (base32 "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z"= )))) > > + (base32 "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z"= )) > > + (modules '((guix build utils))) > > + (snippet > > + '(begin > > + ;; Fixes issue with dependency requirements being too stric= t. See upstream commit: > > + ;; https://git.kernel.org/pub/scm/utils/b4/b4.git/commit/?i= d=3D31348a14afdb1d39e7faf9576eaddea1ced76e19 > > + (substitute* "setup.py" > > + (("\\.0'") "'")) >=20 > Just a note: This won't catch a similar problem if dkimpy (1.0.5) is > upgraded before b4, though perhaps that's unlikely and not worth > worrying about. >=20 > Thank you for the review. Not sure how I forgot I had this waiting for me. I changed the substitution from "\\.0'" to change the ~=3D to >=3D and pushed it. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --ayJS2/MbsUNiq/8U Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmBQpL0ACgkQQarn3Mo9 g1GR2A//W+TDQRKTedaFJ84u8VsGdlb/+HCXn9/iXPglaw2wEWcMg+ZDOLj9khDR Cos/HuHkwsRTc6luHP6mT3me5KywXePP5kgke3/Oe4VQOhCcRY+VriCqOJi748KK AEKu7aFlOMweGxVRfDyaG9wJ7Koz4QTEaYci1+EMTmzOA4gAgXtLPvIxF50H5N3i k+NeVf1C3vbcrMR70yDaFMde0I5jqi9HeSik4GA4l/0P3h27Az0Tu4JesMdD7W86 MOXG2jbhdBgIh/+qZMT5KuIsMmpyh2QiFcXwisffuskbdLDjZ1jWBMpOUnI0cBER d1PNfO0R6/iSGKv9jNPK/Pli1KfuyGWWfa0fOBKQUwKer1STOSkLoZ8diqdE52uc xrs41RN2RGsCOahzlcwebYFpMbtNsz5yza0zSp6oSGvrnNGpBV0A356ZYCvT5Hj2 A5T090G17xbNp3xUthEgE/QrAX9SfmrL8nh0TyhcqgV/FViajI7P1qeBgUv3bxVv xg+iMLf9uKmqmDcy3q/+3QpTNAnkPx7VcBmtSDzqMa8UfkkrOKH4cHxG7gHX+ykI iAhfQtoSp9fMgL4p+MsYuyik9742CcMvnQOk8uZXUdcmfJu8OOrQ7CQ2N15Gbxiy Ny3atfi74GNL8mI3UV2H845m1tHs+f1FBiC7gmNWBmxT3vhsSaQ= =x9bZ -----END PGP SIGNATURE----- --ayJS2/MbsUNiq/8U-- From unknown Sat Sep 13 00:10:58 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 14 Apr 2021 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator