From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36729) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBAxF-0002vu-Ib for guix-patches@gnu.org; Fri, 12 Oct 2018 23:51:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gBAxC-0000x0-AL for guix-patches@gnu.org; Fri, 12 Oct 2018 23:51:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:43393) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gBAxC-0000wi-5j for guix-patches@gnu.org; Fri, 12 Oct 2018 23:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gBAxC-0000Mp-0l for guix-patches@gnu.org; Fri, 12 Oct 2018 23:51:02 -0400 Subject: [bug#33031] [PATCH] gnu: Use pypi.org. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBAw1-0002oV-ET for guix-patches@gnu.org; Fri, 12 Oct 2018 23:49:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gBAvy-0000B2-8u for guix-patches@gnu.org; Fri, 12 Oct 2018 23:49:49 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:55413) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gBAvw-00009T-5z for guix-patches@gnu.org; Fri, 12 Oct 2018 23:49:46 -0400 Received: from jasmine.lan (unknown [50.202.187.162]) by mail.messagingengine.com (Postfix) with ESMTPA id 32DD3E4124 for ; Fri, 12 Oct 2018 23:49:41 -0400 (EDT) From: Leo Famulari Date: Fri, 12 Oct 2018 23:49:36 -0400 Message-Id: <52aae9ef84c41f8489ebd6329659e5a95ad7ca7e.1539402576.git.leo@famulari.name> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33031@debbugs.gnu.org redirects to . * guix/build-system/python.scm (pypi-uri): Replace pypi.io with pypi.org. * guix/import/pypi.scm (pypi-url?): Likewise. * tests/pypi.scm: Likewise. --- guix/build-system/python.scm | 2 +- guix/import/pypi.scm | 2 +- tests/pypi.scm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm index ffed83731..b753940ba 100644 --- a/guix/build-system/python.scm +++ b/guix/build-system/python.scm @@ -50,7 +50,7 @@ "Return a URI string for the Python package hosted on the Python Package Index (PyPI) corresponding to NAME and VERSION. EXTENSION is the file name extension, such as '.tar.gz'." - (string-append "https://pypi.io/packages/source/" + (string-append "https://pypi.org/packages/source/" (string-take name 1) "/" name "/" name "-" version extension)) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 87b047bda..3a20fc4b9 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -330,7 +330,7 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." (define (pypi-url? url) (or (string-prefix? "https://pypi.org/" url) (string-prefix? "https://pypi.python.org/" url) - (string-prefix? "https://pypi.io/packages" url))) + (string-prefix? "https://pypi.org/packages" url))) (let ((source-url (and=> (package-source package) origin-uri)) (fetch-method (and=> (package-source package) origin-method))) diff --git a/tests/pypi.scm b/tests/pypi.scm index 616ec191f..6daa44a6e 100644 --- a/tests/pypi.scm +++ b/tests/pypi.scm @@ -81,7 +81,7 @@ baz > 13.37") (dummy-package "foo" (source (dummy-origin (uri - "https://pypi.io/packages/source/p/psutil/psutil-4.3.0.tar.gz")))))) + "https://pypi.org/packages/source/p/psutil/psutil-4.3.0.tar.gz")))))) (test-equal "guix-package->pypi-name, new URL style" "certbot" -- 2.19.1