Message ID | ef26b85421faf0b61ee1e8e96063da96bac3835e.1744010429.git.maxim.cournoyer@gmail.com |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7D71D27BC4B; Mon, 7 Apr 2025 08:22:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 DD66227BC4A for <patchwork@mira.cbaines.net>; Mon, 7 Apr 2025 08:22:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1u1goH-0003tc-P4; Mon, 07 Apr 2025 03:22:21 -0400 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 <Debian-debbugs@debbugs.gnu.org>) id 1u1go7-0003t2-Hb for guix-patches@gnu.org; Mon, 07 Apr 2025 03:22:13 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1u1go6-0008A3-IQ for guix-patches@gnu.org; Mon, 07 Apr 2025 03:22:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=ANKu+Ol3WIVF5lN2dbbbtVxWi/3lewtZZwrkDRLnQAM=; b=s+uxVsc0MiGhBFMxmzOlPBjhTg1fdyBEilxeSiKe+nxEhP4A565ko25CQOjYpyPhLnMkyAc+dTaLiMPjnHYAV1Z21rFlqPU8HpXXGrffZviyzp9nU3T1rhFyiLd9BP9L3o2Mi6jGOP2nPj5RoHo/cNMPZyOJ9IM5CyUrhSiigAbPKHG0RqrfULT5ThegwArF3TvevLLcDHK3dSmSbIiA4LHfmgWm9tq/sL3ZT1zIhfjF+60zISVEblKnoBZDeuHT4bZHAC3Mvkl32uzAk/yOM9hI4jAynmZW1LJz2kwCELdI//RY5Hf4P5MGadi+5uigaNE6lKNr+ZlujJDiEXdgsg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1u1gny-0001y3-2s; Mon, 07 Apr 2025 03:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77600] [PATCH] import/pypi: Improve renaming procedure. Resent-From: Maxim Cournoyer <maxim.cournoyer@gmail.com> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: lars@6xq.net, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, guix-patches@gnu.org Resent-Date: Mon, 07 Apr 2025 07:22:01 +0000 Resent-Message-ID: <handler.77600.B.17440104937411@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77600 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77600@debbugs.gnu.org Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>, Lars-Dominik Braun <lars@6xq.net>, Munyoki Kilyungi <me@bonfacemunyoki.com>, Sharlatan Hellseher <sharlatanus@gmail.com>, Tanguy Le Carrour <tanguy@bioneland.org> X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Lars-Dominik Braun <lars@6xq.net>, Munyoki Kilyungi <me@bonfacemunyoki.com>, Sharlatan Hellseher <sharlatanus@gmail.com>, Tanguy Le Carrour <tanguy@bioneland.org> Received: via spool by submit@debbugs.gnu.org id=B.17440104937411 (code B ref -1); Mon, 07 Apr 2025 07:22:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Apr 2025 07:21:33 +0000 Received: from localhost ([127.0.0.1]:52072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1u1gnU-0001vQ-O9 for submit@debbugs.gnu.org; Mon, 07 Apr 2025 03:21:33 -0400 Received: from lists.gnu.org ([2001:470:142::17]:60038) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <maxim.cournoyer@gmail.com>) id 1u1gnR-0001uQ-Gx for submit@debbugs.gnu.org; Mon, 07 Apr 2025 03:21:30 -0400 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 <maxim.cournoyer@gmail.com>) id 1u1gmx-0003fY-Q6 for guix-patches@gnu.org; Mon, 07 Apr 2025 03:21:04 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <maxim.cournoyer@gmail.com>) id 1u1gms-00085D-Ee for guix-patches@gnu.org; Mon, 07 Apr 2025 03:20:59 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-2243803b776so54753445ad.0 for <guix-patches@gnu.org>; Mon, 07 Apr 2025 00:20:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744010451; x=1744615251; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ANKu+Ol3WIVF5lN2dbbbtVxWi/3lewtZZwrkDRLnQAM=; b=dZJh8odzBkYNbbZlLuN822lcpcz41yI5/u8Rvkq87yLmrKpDQgi/DRrImNRAfeWBiu LZFoBLVdAmDXNZq9iLszDkWN0xgx9mBA1PHSHXkyH7hk43ZwG9KN/gIi/l4Llk3IvLIH 1wvAYBRIQHpnu4yKsF3X7YGM499LUNQxxKfSdxaoPZQbmavrCAKM4YqSlbnmldmCb83f nkoG7bqJPysj/mBstd88UzSDUZWi0+C2pDkPnfuIY1/gH/TSkH9+XvZlvRDi1taI9k87 4zyjI8gevMfozf0KbJZyoBemhrPLqXaZ5sZ9WuoQqcUgoLpb5SefRtAc0z/jjdlpfhDc ft1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744010451; x=1744615251; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ANKu+Ol3WIVF5lN2dbbbtVxWi/3lewtZZwrkDRLnQAM=; b=bNQn9TBcxFk1KVz2efDViDO8jTsGD+7iCFFRkU7vAuUcSmvn8FVWk8h7n13VsCpgGT yjdlqFeesiuiWsuH8P8ME+jMFoHn9NFWGwfYYCqi3NOYA3tg30pOa+jAN8AesuB2eCfm cBYsCoApiVCLcRpGyJY3sgbi3fzNxsirbRRgRFwcp7v6zrefUOR8DpAvWtpHP+rgGqrs 5C698zBu0s62P5KrkectiPTxQk+SR57ya+ImStFGjChQq45TZyANVj2DWD/FDUN9vRzK tbuYpVnybp/UZ7UYqpjcejraF/YK1oawYAHGgdepZuyRO04NGwCc0Xr7efxAt0/w8tOu NiCA== X-Gm-Message-State: AOJu0YwA0MZS6/0I+iPayIprZ38wZtkJeS2dRiTFCrnpgtmpbmtOsO8o Qhi1m42d8p3j/sq2J6mv2W3r9zaMRUV8IsTVfwaB5YZLSXlnxvmDwrlQiA== X-Gm-Gg: ASbGncsuQUP5YBGMSmjbH0L4lxegSyktBuQzTOngQxTx3/NgTMNZI55V/BZvP+spSSI MrehlZCnrfMhDvUVVJaSaREjKJA455Yc7K6zUR4TWYE+pDLjVlCwZjf9TPjs07okGkAQ2x3lj2S pEI+TaMbYSp9RBxZWZY3HT8k22c+GLf8F1MYJrJ1uwUcFW8FCxaPdckZu/ZYr+or2hbkrya24UU aJHCx9/jFOi8mzolZvQN1pvJ6rt7Pr6cy1k1MJXRmJIH2d68Ep4hqs4z/d+g40Dsk1FKmqR1iN4 bK2BynPjkI3jAVPN8I8vlnli3jIIww/3JNc+fNYN1BsEWbpM3XlQTZ8AsiO5obgvkg+PAQ2M0WE = X-Google-Smtp-Source: AGHT+IHfxJEoah90yGIJ2V3VTO1PBc2ZMx0/wH/a3nu94sq9jxaJlBB4O9kmMFzBxLpm0YP9WN2aqw== X-Received: by 2002:a17:902:ebd1:b0:224:8bf:6d81 with SMTP id d9443c01a7336-22a9558948emr116981005ad.46.1744010450761; Mon, 07 Apr 2025 00:20:50 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-739da0e3734sm8064955b3a.179.2025.04.07.00.20.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 00:20:50 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@gmail.com> Date: Mon, 7 Apr 2025 16:20:29 +0900 Message-ID: <ef26b85421faf0b61ee1e8e96063da96bac3835e.1744010429.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=maxim.cournoyer@gmail.com; helo=mail-pl1-x635.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_FILL_THIS_FORM_SHORT=0.01 autolearn=ham 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: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=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 |
Series |
[bug#77600] import/pypi: Improve renaming procedure.
|
|
Commit Message
Maxim Cournoyer
April 7, 2025, 7:20 a.m. UTC
A package named upstream like 'tmdb-python' now gets named 'python-tmdb' instead of 'python-tmdb-python', which is ugly and doesn't match our convention (info "(guix) Python Modules"). * guix/import/pypi.scm (python->package-name): Turn a -python suffix into a python- prefix. Change-Id: I7c0227d569c0afe6b16329d7cedb51728e4365b0 --- guix/import/pypi.scm | 2 ++ 1 file changed, 2 insertions(+) base-commit: e2f37229e5e7f6e73806d8087faf9e1e94ea9acf
Comments
Hi, The change looks reasonable. Some side note on PyPI source archive naming, they started forcing users to rename them to lower case only and _ https://packaging.python.org/en/latest/discussions/package-formats/ VCS: https://github.incerto.xyz/; https://git.sr.ht/~hellseher/ GPG: 9847 81DE 689C 21C2 6418 0867 76D7 27BF F62C D2B5 … наш разум - превосходная объяснительная машина которая способна найти смысл почти в чем угодно, истолковать любой феномен, но совершенно не в состоянии принять мысль о непредсказуемости.
Hi, Sharlatan Hellseher <sharlatanus@gmail.com> writes: > Hi, > > The change looks reasonable. > > Some side note on PyPI source archive naming, they started forcing > users to rename them to lower case only and _ OK, thanks for looking. About the later naming, that's something to handle in `guix-package->pypi-name', right? I'm not sure this happens *everywhere* for new releases now, on only in packages using modern packaging tools such PEP 517 builders, though? I've now applied this one.
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index dd43ebdcf3..5e2c6ec9ff 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -179,6 +179,8 @@ (define (python->package-name name) package." (cond ((string-prefix? "python-" name) (snake-case name)) + ((string-suffix? "-python" name) + (string-append "python-" (string-drop-right name 7))) ((or (string=? "trytond" name) (string-prefix? "trytond-" name)) (snake-case name)) (else (string-append "python-" (snake-case name)))))