From patchwork Tue Dec 20 09:34:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45441 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 A0F3027BBEB; Tue, 20 Dec 2022 09:47:57 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 477A727BBE9 for ; Tue, 20 Dec 2022 09:47:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2t-00059Z-QZ; Tue, 20 Dec 2022 04:36:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p7Z2Z-0004uv-3S for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7Z2Y-00038u-Ny for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z2Y-0003UA-Ii for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 15/18] import: pypi: Allow updating to a specific version. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Dec 2022 09:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57460 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 57460@debbugs.gnu.org Received: via spool by 57460-submit@debbugs.gnu.org id=B57460.167152891613331 (code B ref 57460); Tue, 20 Dec 2022 09:36:02 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:35:16 +0000 Received: from localhost ([127.0.0.1]:43775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1n-0003So-Ho for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:16 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:50145) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1g-0003QI-5L for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:08 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MSbt9-1pIOml2UCP-00SygY for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:35:02 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 5E1EF669AC; Tue, 20 Dec 2022 10:34:24 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:20 +0100 Message-Id: <2167633f20f8537b163574c0d1cc5b0c59368998.1671527962.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.30.6 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:kd9+tbp1aynyjTkR8fwEEOcg5GnAkoqcAxWqR/8CUivM5IeVGHf sCxLwnbJahFq2QJ+gflVeIfkQoHChvtzO2chH5OtT7sHd35f4HYK3mhUeq45q1wmhc689PZ w1UwmEpPXjpW8MKOeqBc8H9r53KKRrvreCZAsKYbtcekrgVSmksDJ4oYBQvm+/1WJ6eB1Gp AmoxsSopkepJ6u/58kWdA== UI-OutboundReport: notjunk:1;M01:P0:5RMWdOtqR2Q=;zLsxHGBcsQ/lnGU6Yy1QRR4LwnT bOkPLLkzJpf0PpdlkaYr1Jd/ujNmZRQ/obaiDkcoEet0vSJzKPu4eWJmZ/65bnY9KtAKdad+q I0U7a37QwkXOKbm4Avq7+y5I/6RCPTeqEYkCji8n4S5DJZZpbRmQWw34NOwZa3FUvrPzU7JvH NplGNNo8WkW2vG/eG5kewuz5hJF3FCOiEuguSLIVEQSvyVyw04McNI9wv/6W8m/AXhaQPCTAl EPtULMrHflkgpfkzSqv7tBeNvhhG0Q6u4njcneUmuF7TxB2aoFzZyE9V4bdmSlMrq4FzTFZIs j3Z+qYcisDT5EEZ76tofbYXGCk1HVeUW7MifGmArsLOLt2fvUpEq055WOOLprHtkg55bWeUBp rcJNF7A0VoDPRqowraGdN5fU30+XSkDa2Udv1aRRu6LC1nVSOlsKaBdfDQdKESbAHG6KthMJ0 PaOJIcb+f+lSZcIRJAZh+TgjG2c2MVkY6Mu6Fp9pHRqGrGlv8EvS4bc/KLdrlCGPSFhZldDo+ ZijpgmQEaujdSl05xo+6v3UglHplqV1F1Nh0NlzuMbaq/pxPM8n7A404hUWjUF3jFEnVlIbTd ZtLaqfp0Q5DPz7gyX0np3nL+vIMcFjmFRgN4DI7lC59WBUUCy8aE9owEovO8MbBp+1yjGnbGF NxHd+fqXgnS7V3Yy4AqM1hUZhMyzikXojf2I6Y7NJA== 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/import/pypi.scm (latest-release): Rename to 'import-release', add #:version argument and pass it on to called functions. --- guix/import/pypi.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 3e3e949283..0e5998b36e 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021 Marius Bakke ;;; Copyright © 2022 Vivien Kraus ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -556,15 +557,16 @@ source. To build it from source, refer to the upstream repository at (string-prefix? "https://pypi.org/packages" url) (string-prefix? "https://files.pythonhosted.org/packages" url))))) -(define (latest-release package) - "Return an for the latest release of PACKAGE." +(define* (import-release package #:key (version #f)) + "Return an for the latest release of PACKAGE. Optionally +include a VERSION string to fetch a specific version." (let* ((pypi-name (guix-package->pypi-name package)) (pypi-package (pypi-fetch pypi-name))) (and pypi-package (guard (c ((missing-source-error? c) #f)) (let* ((info (pypi-project-info pypi-package)) - (version (project-info-version info)) - (dist (source-release pypi-package)) + (version (or version (project-info-version info))) + (dist (source-release pypi-package version)) (url (distribution-url dist))) (upstream-source (urls (list url)) @@ -574,7 +576,7 @@ source. To build it from source, refer to the upstream repository at #f)) (input-changes (changed-inputs package - (pypi->guix-package pypi-name))) + (pypi->guix-package pypi-name #:version version))) (package (package-name package)) (version version))))))) @@ -583,4 +585,4 @@ source. To build it from source, refer to the upstream repository at (name 'pypi) (description "Updater for PyPI packages") (pred pypi-package?) - (import latest-release))) + (import import-release)))