From patchwork Sat Mar 21 14:37:16 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: 20819 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 1275127BBEA; Sat, 21 Mar 2020 14:39:26 +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, 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 ESMTP id B70D727BBE4 for ; Sat, 21 Mar 2020 14:39:25 +0000 (GMT) Received: from localhost ([::1]:37396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFfHZ-0003hA-8Q for patchwork@mira.cbaines.net; Sat, 21 Mar 2020 10:39:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59037) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFfGF-000253-Ay for guix-patches@gnu.org; Sat, 21 Mar 2020 10:38:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jFfGD-0005Zb-SX for guix-patches@gnu.org; Sat, 21 Mar 2020 10:38:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41825) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jFfGD-0005ZQ-OX for guix-patches@gnu.org; Sat, 21 Mar 2020 10:38:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jFfGD-00017G-LE for guix-patches@gnu.org; Sat, 21 Mar 2020 10:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39777] [PATCH V6] gnu: poetry: Update to 1.0.5. References: <20200225082847.9548-1-tanguy@bioneland.org> In-Reply-To: <20200225082847.9548-1-tanguy@bioneland.org> Resent-From: Tanguy Le Carrour Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 21 Mar 2020 14:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39777 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39777@debbugs.gnu.org Cc: Tanguy Le Carrour Received: via spool by 39777-submit@debbugs.gnu.org id=B39777.15848014664267 (code B ref 39777); Sat, 21 Mar 2020 14:38:01 +0000 Received: (at 39777) by debbugs.gnu.org; 21 Mar 2020 14:37:46 +0000 Received: from localhost ([127.0.0.1]:47798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jFfFy-00016l-E8 for submit@debbugs.gnu.org; Sat, 21 Mar 2020 10:37:46 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:58303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jFfFw-00016R-N3 for 39777@debbugs.gnu.org; Sat, 21 Mar 2020 10:37:45 -0400 X-Originating-IP: 176.185.184.238 Received: from localhost.localdomain (static-176-185-184-238.ftth.abo.bbox.fr [176.185.184.238]) (Authenticated sender: tanguy@bioneland.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id E41D71BF205; Sat, 21 Mar 2020 14:37:37 +0000 (UTC) From: Tanguy Le Carrour Date: Sat, 21 Mar 2020 15:37:16 +0100 Message-Id: <20200321143716.30965-1-tanguy@bioneland.org> X-Mailer: git-send-email 2.25.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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.0.5. [propagated-inputs] Add python-clikit, add python-importlib-metadata, add python-keyring, add python-pexpect, remove python-msgpack, remove python-glob2. [home-page] Update URL. [arguments] Remove distutils patch, patch versions of keyring, pyrsistent and importlib-metadata. --- gnu/packages/python-xyz.scm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f036b66aba..319bd83c43 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11237,34 +11237,37 @@ database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") (define-public poetry (package (name "poetry") - (version "0.12.17") - ;; Poetry can only be built from source with poetry. + (version "1.0.5") + ;; Poetry can only be built from source with Poetry. (source (origin (method url-fetch) (uri (pypi-uri "poetry" version)) (sha256 (base32 - "0gxwcd65qjmzqzppf53x51sic1rbcd9py6cdzx3aprppipimslvf")))) + "02h387k0xssvv78yy82pcpknpq4w5ym2in1zl8cg9r5wljl5w6cf")))) (build-system python-build-system) (arguments `(#:tests? #f ;; Pypi does not have tests. #:phases (modify-phases %standard-phases - (replace 'build + (add-before 'build 'patch-setup-py (lambda _ - ;; Bug in poetry https://github.com/sdispater/poetry/issues/866. - (invoke "sed" "-i" "-e" "s/from distutils.core/from setuptools/" - "setup.py") + (substitute* "setup.py" + (("keyring>=20.0.1,<21.0.0") "keyring>=21.0.0,<22.0.0") ;; poetry won't update version as 21.0.0 relies on python > 3.6 + (("pyrsistent>=0.14.2,<0.15.0") "pyrsistent>=0.14.2,<0.16.0") + (("importlib-metadata>=1.1.3,<1.2.0") "importlib-metadata>=1.1.3,<1.5.0")) #t))))) (propagated-inputs `(("python-cachecontrol" ,python-cachecontrol) ("python-cachy" ,python-cachy) ("python-cleo" ,python-cleo) - ("python-glob2" ,python-glob2) + ("python-clikit" ,python-clikit) ("python-html5lib" ,python-html5lib) + ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8 ("python-jsonschema" ,python-jsonschema) - ("python-msgpack" ,python-msgpack) + ("python-keyring" ,python-keyring) + ("python-pexpect" ,python-pexpect) ("python-pkginfo" ,python-pkginfo) ("python-pyparsing" ,python-pyparsing) ("python-pyrsistent" ,python-pyrsistent) @@ -11273,7 +11276,7 @@ database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") ("python-shellingham" ,python-shellingham) ("python-tomlkit" ,python-tomlkit) ("python-virtualenv" ,python-virtualenv))) - (home-page "https://poetry.eustace.io/") + (home-page "https://python-poetry.org") (synopsis "Python dependency management and packaging made easy") (description "Poetry is a tool for dependency management and packaging in Python. It allows you to declare the libraries your project depends on and