From patchwork Thu Jan 20 19:45:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 36670 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 E7C6027BBEA; Thu, 20 Jan 2022 23:45: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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 7A5C327BBE9 for ; Thu, 20 Jan 2022 23:45:17 +0000 (GMT) Received: from localhost ([::1]:48120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAh7E-0002Zm-Gd for patchwork@mira.cbaines.net; Thu, 20 Jan 2022 18:45:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAdNo-0002S0-5c for guix-patches@gnu.org; Thu, 20 Jan 2022 14:46:16 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38070) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAdNh-0000hv-Qk for guix-patches@gnu.org; Thu, 20 Jan 2022 14:46:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nAdNh-0006ci-OY for guix-patches@gnu.org; Thu, 20 Jan 2022 14:46:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53395] Fix pypi import for flake8-array-spacing Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Jan 2022 19:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53395 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 53395@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164270794725433 (code B ref -1); Thu, 20 Jan 2022 19:46:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 Jan 2022 19:45:47 +0000 Received: from localhost ([127.0.0.1]:59206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAdNS-0006c8-Qg for submit@debbugs.gnu.org; Thu, 20 Jan 2022 14:45:47 -0500 Received: from lists.gnu.org ([209.51.188.17]:58730) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAdNR-0006c1-1C for submit@debbugs.gnu.org; Thu, 20 Jan 2022 14:45:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAdNO-0002KE-QB for guix-patches@gnu.org; Thu, 20 Jan 2022 14:45:44 -0500 Received: from [2a00:5881:4008:2810::309] (port=43526 helo=planete-kraus.eu) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1nAdNM-0000Y8-7l for guix-patches@gnu.org; Thu, 20 Jan 2022 14:45:42 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 9c5185dc for ; Thu, 20 Jan 2022 19:45:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :to:subject:date:message-id:mime-version:content-type; s=dkim; bh=kl4Tk443jZSn3aAuTD8jcEDLnSg=; b=GW0YQWwG8wpmULEDvFLfr4Jt2vv/ XsJWegGOQB8VpGV6MJWNjATvLM22aTDUfpcheXOjKpfcNBpWFvN1rB53JvIPktDK o6Kmcy5fJK4yw4o+//P6FjCQGuyqyZV+xhfmHk5R2QWkKJWt5W8bIlbxcYkNQCn5 +bJi3LYKn+Ys1Cg= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 60877e26 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Thu, 20 Jan 2022 19:45:26 +0000 (UTC) Date: Thu, 20 Jan 2022 20:45:19 +0100 Message-ID: <87czkmi434.fsf@planete-kraus.eu> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:5881:4008:2810::309 (failed) Received-SPF: pass client-ip=2a00:5881:4008:2810::309; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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" Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus X-getmail-retrieved-from-mailbox: Patches Dear guix, flake8-array-spacing is a funny package because its download URI uses a base name of flake8_array_spacing. Apparently some other packages have similar features, appearing as the downcase version. What do you think? Best regards, Vivien From d8923c394fbe2e8eedf6fa548455d398f0caa022 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 20 Jan 2022 20:11:56 +0100 Subject: [PATCH] pypi importer: Convert - to _ in pypi urls if needed. * guix/import/pypi.scm (find-project-url): New function. (make-pypi-sexp): Use find-project-url. --- guix/import/pypi.scm | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index b4284f5c33..fd176e65d5 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -418,6 +418,19 @@ (define process-requirements (values (map process-requirements dependencies) (concatenate dependencies)))) +(define (find-project-url name pypi-url) + "Try different project name substitution until the result is found in +pypi-url. Downcase is required for \"Deprecated\" and \"uWSGI\", and +underscores are required for flake8-array-spacing." + (or (find (cut string-contains pypi-url <>) + (list name + (string-downcase name) + (string-replace-substring name "-" "_"))) + (begin + (warning (G_ "The project name `~a' does not appear in the pypi URL; you might need to fix the pypi-url declaration in the generated package. The URL is: ~a~%") + name pypi-url) + name))) + (define (make-pypi-sexp name version source-url wheel-url home-page synopsis description license) "Return the `package' s-expression for a python package with the given NAME, @@ -446,15 +459,7 @@ (define (maybe-upstream-name name) (origin (method url-fetch) (uri (pypi-uri - ;; PyPI URL are case sensitive, but sometimes - ;; a project named using mixed case has a URL - ;; using lower case, so we must work around this - ;; inconsistency. For actual examples, compare - ;; the URLs of the "Deprecated" and "uWSGI" PyPI - ;; packages. - ,(if (string-contains source-url name) - name - (string-downcase name)) + ,(find-project-url name source-url) version ;; Some packages have been released as `.zip` ;; instead of the more common `.tar.gz`. For -- 2.34.0