From unknown Sat Jun 21 03:04:36 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#50854 <50854@debbugs.gnu.org> To: bug#50854 <50854@debbugs.gnu.org> Subject: Status: [PATCH 0/2] Make the PyPI importer honor the =?UTF-8?Q?=E2=80=98upstream-name=E2=80=99?= package property Reply-To: bug#50854 <50854@debbugs.gnu.org> Date: Sat, 21 Jun 2025 10:04:36 +0000 retitle 50854 [PATCH 0/2] Make the PyPI importer honor the =E2=80=98upstrea= m-name=E2=80=99 package property reassign 50854 guix-patches submitter 50854 Xinglu Chen severity 50854 normal tag 50854 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 27 16:09:50 2021 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= To: guix-patches@gnu.org Subject: [PATCH 0/2] Make the PyPI importer honor the =?utf-8?Q?=E2=80=98u?= =?utf-8?Q?pstream-name=E2=80=99?= package property 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-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: If a PyPI package contains a “-” followed by one or more digits, e.g., “AV-98”, the PyPI importer/updater will think that the digits after the “-” is the version of the package, and instea [...] Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.51.188.17 listed in wl.mailspike.net] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 0.5 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) --=-=-= 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----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 27 16:11:38 2021 Received: (at 50854) by debbugs.gnu.org; 27 Sep 2021 20:11:38 +0000 Received: from localhost ([127.0.0.1]:42948 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUwyJ-0003ET-N3 for submit@debbugs.gnu.org; Mon, 27 Sep 2021 16:11:38 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:60122 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUwyH-0003ED-4g for 50854@debbugs.gnu.org; Mon, 27 Sep 2021 16:11:30 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1632773481; bh=AMD08MdRIDPBMKnVZNSvVlmQtS2LM7ZucuK20cHwnU0=; h=From:To:Subject:In-Reply-To:References:Date; b=FyDAFr53R24FpHFC5EJFkS9e0s/xnAUp1jeMFLMMiefzIOyrMxHQzcg2uKCKvkUvX GO6Z9tlP+0JFtIVhkSlf1Tpfnou3gpFMaGQqTBf9Z6dcg0ipOu6IzAFbGvjhpc0M63 owZwN3VdNTCMxaHg4H7y/ZFfvAjrtIhG05XkbRR0= To: 50854@debbugs.gnu.org Subject: [PATCH 1/2] import: pypi: Honor the 'upstream-name' package property. In-Reply-To: References: Message-Id: <45f4a38589689ee3c640ff54618405a6eb7c4f40.1632772958.git.public@yoctocell.xyz> Date: Mon, 27 Sep 2021 22:11:20 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Previously, when a PyPI package had a “-” followed by one or more digits in its name, e.g., “AV-98”, the importer would interpret “98” as the version of the package and thus mistake the [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 0.0 PDS_RDNS_DYNAMIC_FP RDNS_DYNAMIC with FP steps X-Debbugs-Envelope-To: 50854 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.9 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Previously, when a PyPI package had a “-” followed by one or more digits in its name, e.g., “AV-98”, the importer would interpret “98” as the version of the package and thus mistake the [...] Content analysis details: (1.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager 0.0 PDS_RDNS_DYNAMIC_FP RDNS_DYNAMIC with FP steps Previously, when a PyPI package had a =E2=80=9C-=E2=80=9D followed by one o= r more digits in its name, e.g., =E2=80=9CAV-98=E2=80=9D, the importer would interpret =E2= =80=9C98=E2=80=9D as the version of the package and thus mistake the =E2=80=9CAV-98=E2=80=9D package for the = =E2=80=9Cav=E2=80=9D package on PyPI. $ ./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 woul= d be upgraded from 1.0.1 to 8.0.3 Setting the =E2=80=98upstream-name=E2=80=99 property to =E2=80=9CAV-98=E2= =80=9D would solve the problem. $ ./pre-inst-env guix refresh av-98 /home/yoctocell/src/guix/gnu/packages/web-browsers.scm:914:13: 1.0.1 is a= lready the latest version of av-98 * guix/import/pypi.scm (guix-package->pypi-name): Honor =E2=80=98upstream-n= ame=E2=80=99 property. (make-pypi-sexp): Set =E2=80=98upstream-name=E2=80=99 property when appropr= iate. * tests/pypi.scm (test-json): Rename to ... (test-json-1): ... this. (test-json-2): New variable ("guix-package->pypi-name, honor 'upstream-name'"): New test. ("pypi->guix-package, package name contains \"-\" followed by digits"): Likewise. --- guix/import/pypi.scm | 20 +++++--- tests/pypi.scm | 106 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 113 insertions(+), 13 deletions(-) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 6731d50891..b7859c8341 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -9,6 +9,7 @@ ;;; Copyright =C2=A9 2020 Lars-Dominik Braun ;;; Copyright =C2=A9 2020 Arun Isaac ;;; Copyright =C2=A9 2020 Martin Becze +;;; Copyright =C2=A9 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -163,12 +164,13 @@ (define (url->pypi-name url) (hyphen-package-name->name+version (basename (file-sans-extension url)))) =20 - (match (and=3D> (package-source package) origin-uri) - ((? string? url) - (url->pypi-name url)) - ((lst ...) - (any url->pypi-name lst)) - (#f #f))) + (or (assoc-ref (package-properties package) 'upstream-name) + (match (and=3D> (package-source package) origin-uri) + ((? string? url) + (url->pypi-name url)) + ((lst ...) + (any url->pypi-name lst)) + (#f #f)))) =20 (define (wheel-url->extracted-directory wheel-url) (match (string-split (basename wheel-url) #\-) @@ -423,6 +425,11 @@ (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 N= AME, VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." + (define (maybe-upstream-name name) + (if (string-match ".*\\-[0-9]+" (pk name)) + `((properties ,`'(("upstream-name" . ,name)))) + '())) +=20=20 (call-with-temporary-output-file (lambda (temp port) (and (url-fetch source-url temp) @@ -461,6 +468,7 @@ (define (make-pypi-sexp name version source-url wheel-u= rl home-page synopsis (sha256 (base32 ,(guix-hash-url temp))))) + ,@(maybe-upstream-name name) (build-system python-build-system) ,@(maybe-inputs required-inputs 'propagated-inputs) ,@(maybe-inputs native-inputs 'native-inputs) diff --git a/tests/pypi.scm b/tests/pypi.scm index f421d6d9df..70f4298a90 100644 --- a/tests/pypi.scm +++ b/tests/pypi.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2014 David Thompson ;;; Copyright =C2=A9 2016 Ricardo Wurmus ;;; Copyright =C2=A9 2019 Maxim Cournoyer +;;; Copyright =C2=A9 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,7 +30,7 @@ (define-module (test-pypi) #:use-module (srfi srfi-64) #:use-module (ice-9 match)) =20 -(define test-json +(define test-json-1 "{ \"info\": { \"version\": \"1.0.0\", @@ -57,6 +58,34 @@ (define test-json } }") =20 +(define test-json-2 + "{ + \"info\": { + \"version\": \"1.0.0\", + \"name\": \"foo-99\", + \"license\": \"GNU LGPL\", + \"summary\": \"summary\", + \"home_page\": \"http://example.com\", + \"classifiers\": [], + \"download_url\": \"\" + }, + \"urls\": [], + \"releases\": { + \"1.0.0\": [ + { + \"url\": \"https://example.com/foo-99-1.0.0.egg\", + \"packagetype\": \"bdist_egg\" + }, { + \"url\": \"https://example.com/foo-99-1.0.0.tar.gz\", + \"packagetype\": \"sdist\" + }, { + \"url\": \"https://example.com/foo-99-1.0.0-py2.py3-none-any.whl\", + \"packagetype\": \"bdist_wheel\" + } + ] + } +}") + (define test-source-hash "") =20 @@ -147,6 +176,13 @@ (define test-metadata-with-extras-jedi "\ (uri (list "https://bitheap.org/cram/cram-0.7.tar.gz" (pypi-uri "cram" "0.7")))))))) =20 +(test-equal "guix-package->pypi-name, honor 'upstream-name'" + "bar-3" + (guix-package->pypi-name + (dummy-package "foo" + (properties + '((upstream-name . "bar-3")))))) + (test-equal "specification->requirement-name" '("Fizzy" "PickyThing" "SomethingWithMarker" "requests" "pip") (map specification->requirement-name test-specifications)) @@ -198,8 +234,8 @@ (define test-metadata-with-extras-jedi "\ (lambda (url . rest) (match url ("https://pypi.org/pypi/foo/json" - (values (open-input-string test-json) - (string-length test-json))) + (values (open-input-string test-json-1) + (string-length test-json-1))) ("https://example.com/foo-1.0.0-py2.py3-none-any.whl"= #f) (_ (error "Unexpected URL: " url))))) (match (pypi->guix-package "foo") @@ -264,8 +300,8 @@ (define test-metadata-with-extras-jedi "\ (lambda (url . rest) (match url ("https://pypi.org/pypi/foo/json" - (values (open-input-string test-json) - (string-length test-json))) + (values (open-input-string test-json-1) + (string-length test-json-1))) ("https://example.com/foo-1.0.0-py2.py3-none-any.whl" #= f) (_ (error "Unexpected URL: " url))))) ;; Not clearing the memoization cache here would mean return= ing the value @@ -317,8 +353,8 @@ (define test-metadata-with-extras-jedi "\ (lambda (url . rest) (match url ("https://pypi.org/pypi/foo/json" - (values (open-input-string test-json) - (string-length test-json))) + (values (open-input-string test-json-1) + (string-length test-json-1))) ("https://example.com/foo-1.0.0-py2.py3-none-any.whl" #= f) (_ (error "Unexpected URL: " url))))) ;; Not clearing the memoization cache here would mean return= ing the value @@ -345,4 +381,60 @@ (define test-metadata-with-extras-jedi "\ (x (pk 'fail x #f)))))) =20 +(test-assert "pypi->guix-package, package name contains \"-\" followed by = digits" + ;; Replace network resources with sample data. + (mock ((guix import utils) url-fetch + (lambda (url file-name) + (match url + ("https://example.com/foo-99-1.0.0.tar.gz" + (begin + ;; Unusual requires.txt location should still be found. + (mkdir-p "foo-99-1.0.0/src/bizarre.egg-info") + (with-output-to-file "foo-99-1.0.0/src/bizarre.egg-info/re= quires.txt" + (lambda () + (display test-requires.txt))) + (parameterize ((current-output-port (%make-void-port "rw+"= ))) + (system* "tar" "czvf" file-name "foo-99-1.0.0/")) + (delete-file-recursively "foo-99-1.0.0") + (set! test-source-hash + (call-with-input-file file-name port-sha256)))) + ("https://example.com/foo-99-1.0.0-py2.py3-none-any.whl" #f) + (_ (error "Unexpected URL: " url))))) + (mock ((guix http-client) http-fetch + (lambda (url . rest) + (match url + ("https://pypi.org/pypi/foo-99/json" + (values (open-input-string test-json-2) + (string-length test-json-2))) + ("https://example.com/foo-99-1.0.0-py2.py3-none-any.whl= " #f) + (_ (error "Unexpected URL: " url))))) + (match (pypi->guix-package "foo-99") + (('package + ('name "python-foo-99") + ('version "1.0.0") + ('source ('origin + ('method 'url-fetch) + ('uri ('pypi-uri "foo-99" 'version)) + ('sha256 + ('base32 + (? string? hash))))) + ('properties ('quote (("upstream-name" . "foo-99")))) + ('build-system 'python-build-system) + ('propagated-inputs + ('quasiquote + (("python-bar" ('unquote 'python-bar)) + ("python-foo" ('unquote 'python-foo))))) + ('native-inputs + ('quasiquote + (("python-pytest" ('unquote 'python-pytest))))) + ('home-page "http://example.com") + ('synopsis "summary") + ('description "summary") + ('license 'license:lgpl2.0)) + (string=3D? (bytevector->nix-base32-string + test-source-hash) + hash)) + (x + (pk 'fail x #f)))))) + (test-end "pypi") --=20 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 27 16:11:38 2021 Received: (at 50854) by debbugs.gnu.org; 27 Sep 2021 20:11:38 +0000 Received: from localhost ([127.0.0.1]:42951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUwyQ-0003Ei-Ee for submit@debbugs.gnu.org; Mon, 27 Sep 2021 16:11:38 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:60128 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUwyM-0003EK-JB for 50854@debbugs.gnu.org; Mon, 27 Sep 2021 16:11:35 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1632773487; bh=669pH3xEPv3NtGY0ZcR3vZM1E/GHBosOdyHQNb5nClI=; h=From:To:Subject:In-Reply-To:References:Date; b=M7TqPfnLaxdM44owN8seaUgBmFlwDGe9lv1V1SYcNDv3qmoXRoLcB0PuhKPrf9zQc bRmBsmxjGwJEx8S3MMoAE1FVo7OovjtYaUrbnoRwDMM72j2udMLsNjT2Ty2lo32a1r kYJr/l313BV4u4HGoI0NkbkNtyw2B6dNONzNIz0Q= To: 50854@debbugs.gnu.org Subject: [PATCH 2/2] gnu: av-98: Set 'upstream-name' property. In-Reply-To: References: Message-Id: <2547a5160ecf1a25cad90479c09135e676a30f33.1632772958.git.public@yoctocell.xyz> Date: Mon, 27 Sep 2021 22:11:26 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/web-browsers.scm (av-98)[properties]: Set ‘upstream-name’. --- gnu/packages/web-browsers.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index f0aefa3eb4..596d9f7f2b 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -912,6 +912,8 [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 0.0 PDS_RDNS_DYNAMIC_FP RDNS_DYNAMIC with FP steps X-Debbugs-Envelope-To: 50854 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.9 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/web-browsers.scm (av-98)[properties]: Set ‘upstream-name’. --- gnu/packages/web-browsers.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index f0aefa3eb4..596d9f7f2b 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -912,6 +912,8 [...] Content analysis details: (1.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager 0.0 PDS_RDNS_DYNAMIC_FP RDNS_DYNAMIC with FP steps * gnu/packages/web-browsers.scm (av-98)[properties]: Set =E2=80=98upstream-= name=E2=80=99. --- gnu/packages/web-browsers.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index f0aefa3eb4..596d9f7f2b 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -912,6 +912,8 @@ (define-public av-98 (package (name "av-98") (version "1.0.1") + (properties + '((upstream-name . "AV-98"))) (source (origin (method url-fetch) --=20 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 30 17:24:22 2021 Received: (at 50854-done) by debbugs.gnu.org; 30 Sep 2021 21:24:22 +0000 Received: from localhost ([127.0.0.1]:54218 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mW3XS-0006hM-II for submit@debbugs.gnu.org; Thu, 30 Sep 2021 17:24:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mW3XR-0006hA-8K for 50854-done@debbugs.gnu.org; Thu, 30 Sep 2021 17:24:22 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60778) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mW3XL-0004wN-Gs; Thu, 30 Sep 2021 17:24:15 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=36452 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mW3XK-0006aZ-LL; Thu, 30 Sep 2021 17:24:15 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Xinglu Chen Subject: Re: bug#50854: [PATCH 0/2] Make the PyPI importer honor the =?utf-8?Q?=E2=80=98upstream-name=E2=80=99?= package property References: Date: Thu, 30 Sep 2021 23:24:12 +0200 In-Reply-To: (Xinglu Chen's message of "Mon, 27 Sep 2021 22:09:21 +0200") Message-ID: <87h7e121vn.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 50854-done Cc: 50854-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) Xinglu Chen skribis: > If a PyPI package contains a =E2=80=9C-=E2=80=9D followed by one or more = digits, e.g., > =E2=80=9CAV-98=E2=80=9D, the PyPI importer/updater will think that the di= gits 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. > > $ ./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 woul= d be upgraded from 1.0.1 to 8.0.3 > > 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 o= ne or more > digits. > > The second patch sets the =E2=80=98upstream-name=E2=80=99 property for th= e =E2=80=98av-98=E2=80=99 > package. Nice. > Xinglu Chen (2): > import: pypi: Honor the 'upstream-name' package property. > gnu: av-98: Set 'upstream-name' property. Applied, thanks! Ludo'. From unknown Sat Jun 21 03:04:36 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 29 Oct 2021 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator