GNU bug report logs - #33031
[PATCH] gnu: Use pypi.org.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 33031 in the body.
You can then email your comments to 33031 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: Use pypi.org.
Date: Fri, 12 Oct 2018 23:49:36 -0400

<pypi.io> redirects to <pypi.org>.

* 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

Message #8 received at 33031 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Leo Famulari <leo <at> famulari.name>
Cc: 33031 <at> debbugs.gnu.org
Subject: Re: [bug#33031] [PATCH] gnu: Use pypi.org.
Date: Wed, 17 Oct 2018 18:24:42 +0200

Leo Famulari <leo <at> famulari.name> skribis:

> <pypi.io> redirects to <pypi.org>.
>
> * guix/build-system/python.scm (pypi-uri): Replace pypi.io with pypi.org.
> * guix/import/pypi.scm (pypi-url?): Likewise.
> * tests/pypi.scm: Likewise.

LGTM, thanks!

Ludo'.

Message #13 received at 33031-done <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 33031-done <at> debbugs.gnu.org
Subject: Re: [bug#33031] [PATCH] gnu: Use pypi.org.
Date: Thu, 18 Oct 2018 23:47:03 -0400

[Message part 1 (text/plain, inline)]

On Wed, Oct 17, 2018 at 06:24:42PM +0200, Ludovic Courtès wrote:
> LGTM, thanks!

Thanks! Pushed as 7277d06d8b956263ef1773c5f61e53dc65583ddd

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.