From patchwork Thu Jan 13 09:50:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tanguy LE CARROUR X-Patchwork-Id: 36287 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 ADE4627BBEA; Thu, 13 Jan 2022 09:52:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 75B3527BBE9 for ; Thu, 13 Jan 2022 09:52:10 +0000 (GMT) Received: from localhost ([::1]:56276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7wm9-0008K3-Kz for patchwork@mira.cbaines.net; Thu, 13 Jan 2022 04:52:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7wm2-0008Jc-0f for guix-patches@gnu.org; Thu, 13 Jan 2022 04:52:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39123) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7wm1-0002pJ-Nm for guix-patches@gnu.org; Thu, 13 Jan 2022 04:52:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n7wm1-0004XT-N4 for guix-patches@gnu.org; Thu, 13 Jan 2022 04:52:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53228] [PATCH 1/2] Revert "gnu: Remove python-msgpack-transitional." References: <20220113094529.2709-1-tanguy@bioneland.org> In-Reply-To: <20220113094529.2709-1-tanguy@bioneland.org> Resent-From: Tanguy Le Carrour Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Jan 2022 09:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53228 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53228@debbugs.gnu.org Cc: Tanguy Le Carrour Received: via spool by 53228-submit@debbugs.gnu.org id=B53228.164206746617340 (code B ref 53228); Thu, 13 Jan 2022 09:52:01 +0000 Received: (at 53228) by debbugs.gnu.org; 13 Jan 2022 09:51:06 +0000 Received: from localhost ([127.0.0.1]:60254 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7wl5-0004VT-4K for submit@debbugs.gnu.org; Thu, 13 Jan 2022 04:51:06 -0500 Received: from relay10.mail.gandi.net ([217.70.178.230]:60741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7wl0-0004Un-Os for 53228@debbugs.gnu.org; Thu, 13 Jan 2022 04:51:02 -0500 Received: (Authenticated sender: tanguy@bioneland.org) by relay10.mail.gandi.net (Postfix) with ESMTPSA id C7B122401D5; Thu, 13 Jan 2022 09:50:51 +0000 (UTC) From: Tanguy Le Carrour Date: Thu, 13 Jan 2022 10:50:33 +0100 Message-Id: <20220113095034.3849-1-tanguy@bioneland.org> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 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 This reverts commit d5ae6739fdb4786c49d33de3fec9872c73d2e311. --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e53ba67cdc..66ec26d142 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10923,6 +10923,40 @@ (define-public python-msgpack (home-page "https://pypi.org/project/msgpack/") (license license:asl2.0))) +;; This msgpack library's name changed from "python-msgpack" to "msgpack" with +;; release 0.5. Some packages like borg still call it by the old name for now. +;; +(define-public python-msgpack-transitional + (package + (inherit python-msgpack) + (name "python-msgpack-transitional") + (version "0.5.6") + (source (origin + (method url-fetch) + (uri (pypi-uri "msgpack" version)) + (sha256 + (base32 + "1hz2dba1nvvn52afg34liijsm7kn65cmn06dl0xbwld6bb4cis0f")))) + (arguments + (substitute-keyword-arguments (package-arguments python-msgpack) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'configure-transitional + (lambda _ + ;; Keep using the old name. + (substitute* "setup.py" + (("TRANSITIONAL = False") + "TRANSITIONAL = 1")) + ;; This old version is not compatible with Python 3.9 + (substitute* '("test/test_buffer.py" "test/test_extension.py") + ((".tostring\\(") ".tobytes(")) + (substitute* '("test/test_buffer.py" "test/test_extension.py") + ((".fromstring\\(") ".frombytes(")) + #t)))))))) + +(define-public python2-msgpack + (package-with-python2 python-msgpack)) + (define-public python-netaddr (package (name "python-netaddr") From patchwork Thu Jan 13 09:50:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tanguy LE CARROUR X-Patchwork-Id: 36288 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 54ADE27BBEA; Thu, 13 Jan 2022 09:52:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1CB5327BBE9 for ; Thu, 13 Jan 2022 09:52:17 +0000 (GMT) Received: from localhost ([::1]:56696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7wmG-0000At-9P for patchwork@mira.cbaines.net; Thu, 13 Jan 2022 04:52:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7wm2-0008Jp-Bk for guix-patches@gnu.org; Thu, 13 Jan 2022 04:52:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39124) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7wm2-0002pQ-2T for guix-patches@gnu.org; Thu, 13 Jan 2022 04:52:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n7wm2-0004Xa-2f for guix-patches@gnu.org; Thu, 13 Jan 2022 04:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53228] [PATCH 2/2] gnu: poetry: Fix inputs. Resent-From: Tanguy Le Carrour Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Jan 2022 09:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53228 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53228@debbugs.gnu.org Cc: Tanguy Le Carrour Received: via spool by 53228-submit@debbugs.gnu.org id=B53228.164206746617346 (code B ref 53228); Thu, 13 Jan 2022 09:52:02 +0000 Received: (at 53228) by debbugs.gnu.org; 13 Jan 2022 09:51:06 +0000 Received: from localhost ([127.0.0.1]:60256 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7wl8-0004Vd-J1 for submit@debbugs.gnu.org; Thu, 13 Jan 2022 04:51:06 -0500 Received: from relay10.mail.gandi.net ([217.70.178.230]:52893) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7wl2-0004Uv-H7 for 53228@debbugs.gnu.org; Thu, 13 Jan 2022 04:51:03 -0500 Received: (Authenticated sender: tanguy@bioneland.org) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 8C23A2401CF; Thu, 13 Jan 2022 09:50:54 +0000 (UTC) From: Tanguy Le Carrour Date: Thu, 13 Jan 2022 10:50:34 +0100 Message-Id: <20220113095034.3849-2-tanguy@bioneland.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220113095034.3849-1-tanguy@bioneland.org> References: <20220113095034.3849-1-tanguy@bioneland.org> MIME-Version: 1.0 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 * gnu/packages/python-xyz.scm (poetry)[propagated-inputs]: Replace python-msgpack with python-msgpack-transitional. --- gnu/packages/python-xyz.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 66ec26d142..0091165d37 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16119,7 +16119,9 @@ (define-public poetry python-entrypoints python-html5lib python-keyring - python-msgpack + ; Use of deprecated version of msgpack reported upstream: + ; https://github.com/python-poetry/poetry/issues/3607 + python-msgpack-transitional python-packaging python-pexpect python-pip