From patchwork Sat Oct 9 10:21:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 33707 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 5F4B827BBE3; Sat, 9 Oct 2021 11:22:09 +0100 (BST) 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_H2,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 2DDAC27BBE1 for ; Sat, 9 Oct 2021 11:22:09 +0100 (BST) Received: from localhost ([::1]:35472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mZ9UW-00038E-9f for patchwork@mira.cbaines.net; Sat, 09 Oct 2021 06:22:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZ9UQ-000386-8S for guix-patches@gnu.org; Sat, 09 Oct 2021 06:22:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40780) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mZ9UP-0005P8-W3 for guix-patches@gnu.org; Sat, 09 Oct 2021 06:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mZ9UP-0004Mf-S2 for guix-patches@gnu.org; Sat, 09 Oct 2021 06:22:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51108] [PATCH] import: pypi: Support 'input-changes'. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Oct 2021 10:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51108 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51108@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163377488116727 (code B ref -1); Sat, 09 Oct 2021 10:22:01 +0000 Received: (at submit) by debbugs.gnu.org; 9 Oct 2021 10:21:21 +0000 Received: from localhost ([127.0.0.1]:52326 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZ9Tl-0004Lj-Cs for submit@debbugs.gnu.org; Sat, 09 Oct 2021 06:21:21 -0400 Received: from lists.gnu.org ([209.51.188.17]:38880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZ9Tj-0004La-Tl for submit@debbugs.gnu.org; Sat, 09 Oct 2021 06:21:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZ9Tj-00036d-P0 for guix-patches@gnu.org; Sat, 09 Oct 2021 06:21:19 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:58024 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZ9Ti-00052T-9A for guix-patches@gnu.org; Sat, 09 Oct 2021 06:21:19 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1633774875; bh=NRqMgmb/Cpt0DoQLv3q2S3+41vgt9VzIc+MYtbjvQh0=; h=From:To:Subject:Date; b=MD/k3aMShggZ0gWNVMWZ+q2kZbwtyQK02uiGjrvaZb7xWxtlNTpLEFJynWfua7uhF T+P43G/mblut8fdKTY8Z3d3mqSK23npmTfbp8coyHMzsBW8zNqYM1mGW29/bol7xk5 hzU1msW7CGhCWDmCXj1lsx1jpSJOyvcAmdrxdZzU= Message-Id: Date: Sat, 09 Oct 2021 12:21:15 +0200 MIME-Version: 1.0 Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 35 X-Spam_score: 3.5 X-Spam_bar: +++ X-Spam_report: (3.5 / 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, FROM_SUSPICIOUS_NTLD=0.5, FROM_SUSPICIOUS_NTLD_FP=1.999, PDS_OTHER_BAD_TLD=1.999, PDS_RDNS_DYNAMIC_FP=0.006, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TO_NO_BRKTS_DYNIP=0.133 autolearn=no 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 * guix/import/pypi.scm (latest-release): Specify the ‘input-changes’ field. --- guix/import/pypi.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) base-commit: fd8ea9abf5b4ded096b7ccadb5e36fde4bac0867 diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index b7859c8341..52835cf44d 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -532,7 +532,8 @@ (define pypi-package? (define (latest-release package) "Return an for the latest release of PACKAGE." (let* ((pypi-name (guix-package->pypi-name package)) - (pypi-package (pypi-fetch pypi-name))) + (pypi-package (pypi-fetch pypi-name)) + (name (package-name package))) (and pypi-package (guard (c ((missing-source-error? c) #f)) (let* ((info (pypi-project-info pypi-package)) @@ -540,9 +541,12 @@ (define (latest-release package) (url (distribution-url (latest-source-release pypi-package)))) (upstream-source - (package (package-name package)) + (package name) (version version) - (urls (list url)))))))) + (urls (list url)) + (input-changes + (changed-inputs name + (pypi->guix-package pypi-name))))))))) (define %pypi-updater (upstream-updater