From patchwork Mon Nov 30 09:49:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tanguy LE CARROUR X-Patchwork-Id: 25470 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 EA9BA27BBF8; Mon, 30 Nov 2020 09:50:40 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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 55D4827BBF9 for ; Mon, 30 Nov 2020 09:50:40 +0000 (GMT) Received: from localhost ([::1]:55630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjfpP-0000rA-CZ for patchwork@mira.cbaines.net; Mon, 30 Nov 2020 04:50:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjfoq-0000nH-Pv for guix-patches@gnu.org; Mon, 30 Nov 2020 04:50:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42008) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kjfoq-000895-Iz for guix-patches@gnu.org; Mon, 30 Nov 2020 04:50:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kjfoq-0000Z5-Hl for guix-patches@gnu.org; Mon, 30 Nov 2020 04:50:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44077] [PATCH v5 7/7] gnu: poetry: Update to 1.1.4. Resent-From: Tanguy Le Carrour Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Nov 2020 09:50:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44077 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44077@debbugs.gnu.org Cc: Tanguy Le Carrour Received: via spool by 44077-submit@debbugs.gnu.org id=B44077.16067297872092 (code B ref 44077); Mon, 30 Nov 2020 09:50:04 +0000 Received: (at 44077) by debbugs.gnu.org; 30 Nov 2020 09:49:47 +0000 Received: from localhost ([127.0.0.1]:53546 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjfoZ-0000Xg-0y for submit@debbugs.gnu.org; Mon, 30 Nov 2020 04:49:47 -0500 Received: from relay10.mail.gandi.net ([217.70.178.230]:48393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjfoS-0000Wk-SK for 44077@debbugs.gnu.org; Mon, 30 Nov 2020 04:49:41 -0500 Received: from rafflesia.easter-eggs.fr (176-159-32-89.abo.bbox.fr [176.159.32.89]) (Authenticated sender: tanguy@bioneland.org) by relay10.mail.gandi.net (Postfix) with ESMTPA id F17AB240005; Mon, 30 Nov 2020 09:49:34 +0000 (UTC) From: Tanguy Le Carrour Date: Mon, 30 Nov 2020 10:49:03 +0100 Message-Id: <20201130094903.11700-7-tanguy@bioneland.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201130094903.11700-1-tanguy@bioneland.org> References: <20201130094903.11700-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): Update to 1.1.4. [arguments]: Loosen constraint on python-keyring only. [propagated-inputs] Remove python-jsonschema, python-pyparsing and python-pyrsistent. Add python-pip, python-packaging and python-poetry-core. Use python-requests-toolbelt-0.9.1. --- gnu/packages/python-xyz.scm | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6580d22994..1086d724f1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13208,7 +13208,7 @@ compatible build front-ends to build Poetry managed projects.") (define-public poetry (package (name "poetry") - (version "1.0.10") + (version "1.1.4") ;; Poetry can only be built from source with Poetry. (source (origin @@ -13216,7 +13216,7 @@ compatible build front-ends to build Poetry managed projects.") (uri (pypi-uri "poetry" version)) (sha256 (base32 - "1wm66xlsls4f0q4skmq96yb7aahjsqwgwvbrw4iax6rd4xfqj6sb")))) + "1a2kgfiw66fvxhlqk5qc83s6l38czfh5hcsrbiy7qq5yfc8mlsll")))) (build-system python-build-system) (arguments `(#:tests? #f ;; Pypi does not have tests. @@ -13225,14 +13225,9 @@ compatible build front-ends to build Poetry managed projects.") (add-before 'build 'patch-setup-py (lambda _ (substitute* "setup.py" - ;; poetry won't update version as 21.0.0 relies on python > 3.6 - (("keyring>=20.0.1,<21.0.0") "keyring>=21.0.0,<22.0.0") - (("pyrsistent>=0.14.2,<0.15.0") "pyrsistent>=0.14.2,<0.17.0") - ;; Reported upstream: - ;; . - (("tomlkit>=0.5.11,<0.6.0") "tomlkit>=0.5.11,<0.7.0") - (("cleo>=0.7.6,<0.8.0") "cleo>=0.7.6,<0.9.0") - (("clikit>=0.4.2,<0.5.0") "clikit>=0.4.2,<0.7.0")) + ;; Newer versions of keyring produce a package with version "0.0.0" + ;; Reported upstream: + (("keyring>=21.2.0,<22.0.0") "keyring>=21.0.0,<22.0.0")) #t))))) (propagated-inputs `(("python-cachecontrol" ,python-cachecontrol) @@ -13240,15 +13235,15 @@ compatible build front-ends to build Poetry managed projects.") ("python-cleo" ,python-cleo) ("python-clikit" ,python-clikit) ("python-html5lib" ,python-html5lib) - ("python-jsonschema" ,python-jsonschema) ("python-keyring" ,python-keyring) ("python-msgpack-transitional" ,python-msgpack-transitional) + ("python-packaging" ,python-packaging) ("python-pexpect" ,python-pexpect) + ("python-pip" ,python-pip) ("python-pkginfo" ,python-pkginfo) - ("python-pyparsing" ,python-pyparsing) - ("python-pyrsistent" ,python-pyrsistent) + ("python-poetry-core" ,python-poetry-core) ("python-requests" ,python-requests) - ("python-requests-toolbelt" ,python-requests-toolbelt) + ("python-requests-toolbelt" ,python-requests-toolbelt-0.9.1) ("python-shellingham" ,python-shellingham) ("python-tomlkit" ,python-tomlkit) ("python-virtualenv" ,python-virtualenv)))