From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0JFaAjAmUmGengAAgWs5BA (envelope-from ) for ; Mon, 27 Sep 2021 22:14:40 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 8DejOS8mUmGyQQAA1q6Kng (envelope-from ) for ; Mon, 27 Sep 2021 20:14:39 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 69BAE207C9 for ; Mon, 27 Sep 2021 22:14:39 +0200 (CEST) Received: from localhost ([::1]:53460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUx1K-0007dw-JE for larch@yhetil.org; Mon, 27 Sep 2021 16:14:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUwws-0002Xo-VD for guix-patches@gnu.org; Mon, 27 Sep 2021 16:10:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59625) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUwws-0000CW-Ni for guix-patches@gnu.org; Mon, 27 Sep 2021 16:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mUwws-0003Bd-CF for guix-patches@gnu.org; Mon, 27 Sep 2021 16:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50854] [PATCH 0/2] Make the PyPI importer honor the =?UTF-8?Q?=E2=80=98upstream-name=E2=80=99?= package property Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Sep 2021 20:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50854 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50854@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163277339012220 (code B ref -1); Mon, 27 Sep 2021 20:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Sep 2021 20:09:50 +0000 Received: from localhost ([127.0.0.1]:42938 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUwwg-0003B1-5Z for submit@debbugs.gnu.org; Mon, 27 Sep 2021 16:09:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:49552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUwwe-0003At-Td for submit@debbugs.gnu.org; Mon, 27 Sep 2021 16:09:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUwwd-0002Ru-K4 for guix-patches@gnu.org; Mon, 27 Sep 2021 16:09:48 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:51798 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 1mUwwb-0008K3-5A for guix-patches@gnu.org; Mon, 27 Sep 2021 16:09:46 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1632773372; bh=SCgJkqP5g4Y05eZ2idpoQXwtUBeoge2jT/7qEdJlcBM=; h=From:To:Subject:Date; b=YpekHuwewAiu/ZfaG4iUFSHMjfNxLjOMjPteorepR1UTVbgca/r27mtaefFUsKmMl 0bSvKw62SHII0MB/mqWzs2wLdk+B+HNTZTu2ZzSIxFWpACA+bLJRpUTZ4iZjN7tkR9 y83YFR2eRzZCcLiU7abS+FP2tM0yUDB86t+YW/Ac= Message-Id: Date: Mon, 27 Sep 2021 22:09:21 +0200 MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 45 X-Spam_score: 4.5 X-Spam_bar: ++++ X-Spam_report: (4.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.499, FROM_SUSPICIOUS_NTLD_FP=0.8, PDS_OTHER_BAD_TLD=1.999, PDS_RDNS_DYNAMIC_FP=0.001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TO_NO_BRKTS_DYNIP=2.299 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632773679; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=vsowvxde1Q+UGqoqRTJaDOwuloQOXpgV0qqqvaIlGoI=; b=TVwZbbQEOvPS6r69yco9rBbA6lguIJj7PtOxuBgkllWoCjqs600yXRQbN7iP1LoT/xENhU GVCx2flBulOo/x7BRazhORzuMO26PultRusoUBfOCRZAwFB2HvAfwacImf4wl0UNIm/pfv hLtdSCZPf4R6HbwAoafHZoST11pvU5jsEpSAeOn+D//JBl2HrElrlOmWlqL4n7/iT3305r 9QVaLETh7rd4/RgJn0MTK89qMyd6MddRy9LTAMNtJGKvutFOuAbzcUKnajCAQ0Ons3/F9w IlCl5BeJ1+YIQFHgiLVU4cT77EZDCDK3JYCaOiz6F2hwd7AajTHB9jmRAz8QSg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632773679; a=rsa-sha256; cv=none; b=H9nta0i9lo5xH49oFA4onaQvHg7kR3jm7StMG/djOI+xQC1WigUz54Bg2freMR5yFV+mfa nsm0kORBtc76OG0j3Qh8iuK1E8+dh8magQBcplduPRu54pBRVT07cyJTHNfmUGWIdLyU87 rhNdEDKhMDTPitctBVo3H0tv82kxIHfncW82dboJYTdbv5pidtpkAo+SZKIEOFDPhgoq2j rE2Y/92ql3plKHmi7KSYYAMrya5M+Ai2SKIgzVtvZqSrEM3U9GPMEQuS3ZzQ0wix7l3I98 427mrmZoDozGp2v1ACSzNmQZpgX454I+EY/Ob39+yHOVhBqhlbMTEPpV9EmoPA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=YpekHuwe; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.39 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=YpekHuwe; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 69BAE207C9 X-Spam-Score: -2.39 X-Migadu-Scanner: scn0.migadu.com X-TUID: 3gKRrlsoRkkS --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable If a PyPI package contains a =E2=80=9C-=E2=80=9D followed by one or more di= gits, e.g., =E2=80=9CAV-98=E2=80=9D, the PyPI importer/updater will think that the digi= ts after the =E2=80=9C-=E2=80=9D is the version of the package, and instead of trying to= update =E2=80=9CAV-98=E2=80=9D it will try to update =E2=80=9CAV=E2=80=9D. =2D-8<---------------cut here---------------start------------->8--- $ ./pre-inst-env guix refresh av-98 following redirection to `https://pypi.org/pypi/av/json'... /home/yoctocell/src/guix/gnu/packages/web-browsers.scm:914:13: av-98 would = be upgraded from 1.0.1 to 8.0.3 =2D-8<---------------cut here---------------end--------------->8--- The first patch makes the PyPI importer honor the =E2=80=98upstream-name=E2= =80=99 property; it will also generate a package with an =E2=80=98upstream-name=E2= =80=99 property if the package name contains a =E2=80=9C-=E2=80=9D followed by one= or more digits. The second patch sets the =E2=80=98upstream-name=E2=80=99 property for the = =E2=80=98av-98=E2=80=99 package. Xinglu Chen (2): import: pypi: Honor the 'upstream-name' package property. gnu: av-98: Set 'upstream-name' property. gnu/packages/web-browsers.scm | 2 + guix/import/pypi.scm | 20 +++++-- tests/pypi.scm | 106 +++++++++++++++++++++++++++++++--- 3 files changed, 115 insertions(+), 13 deletions(-) base-commit: 6ae4644984608b7eff7ab54d3a5787c661d85b2e =2D-=20 2.33.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEAVhh4yyK5+SEykIzrPUJmaL7XHkFAmFSJPEVHHB1YmxpY0B5 b2N0b2NlbGwueHl6AAoJEKz1CZmi+1x5GS8P/3++yVZhUaabvkyJCIle+4V4Mwdd hLUNnELSh2a5CR3ETEk3XV51AWmyJ3jFLTOdM6ZztUb/kEub1Dk6Xc4tO2lqCmPd jLE+fm73eySUPchnDq26jn5zV5gPrEOrW9LIKIU8IL86ht+e0aL2mohAfEQQGizx toIC7m67cYErFX1LFo5SmU7t3NXPRuzPVX6U7HJTm4uCkLo08eyQksef/HHZoOwl oWt9zokhXqVWW2cSSKM44zo3F8ar7VAtrYz+QA746fYc23qXXWbOuwRohn8Vce0d 1+egxkQr7TQjpcEKTEDtv43BRfey5B1NQL6Pw2HbG04fE1hK8eX+0DJxlc9z6Qf6 D2UlqUF6JgVp4NLiO7J16Uzxp252sBayo+TyS6zuC3Fx1DQF7niv+VYRCL3o+Uns 1qf8mtVqHHAXbZKVl4QmEqpIYyt162Y4DwAzuI6NGo06NiCZLIx9q+eQY922+LDj tQOanOnIggKH+C6SiqJ40tF46iS7RFGD80tJl67thSADslLdx8qAXGX6c0zik4bj dnBCpHxEO4nl64vk/5gjT/0mlxuhy2pU58Dk/kh3tYZtjSAMIlaZUnxkInXOV7EX KLu677B3V4iTDn8FXUyQfAJnzpBHeT9SglqTLzvBMRcXb2VIdSm6BZ6QpVuAsHuR dHSoCAPvL8j4Bagp =ftX3 -----END PGP SIGNATURE----- --=-=-=--