From patchwork Tue Mar 2 01:51:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 27404 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 79D8D27BC4E; Tue, 2 Mar 2021 01:53:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 31AE427BC4F for ; Tue, 2 Mar 2021 01:53:18 +0000 (GMT) Received: from localhost ([::1]:44620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGuDt-0000qV-AU for patchwork@mira.cbaines.net; Mon, 01 Mar 2021 20:53:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGuDe-0000pi-BN for guix-patches@gnu.org; Mon, 01 Mar 2021 20:53:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39734) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lGuDe-0005kq-0I for guix-patches@gnu.org; Mon, 01 Mar 2021 20:53:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lGuDd-0007wg-Ty for guix-patches@gnu.org; Mon, 01 Mar 2021 20:53:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46866] [PATCH] gnu: b4: Fix setup.py version incompatibility. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Mar 2021 01:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46866 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46866@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161464995030502 (code B ref -1); Tue, 02 Mar 2021 01:53:01 +0000 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 Date: Mon, 1 Mar 2021 20:51:58 -0500 Message-Id: <20210302015158.16177-1-kyle@kyleam.com> MIME-Version: 1.0 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-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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 base-commit: 4bc9a1f4e3bd39302b4ceaab8589a2e6ef82c4bd 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