[debbugs-tracker] bug#33031: closed ([PATCH] gnu: Use pypi.org.)

[GNU bug Tracking System]

Your message dated Thu, 18 Oct 2018 23:47:03 -0400
with message-id <address@hidden>
and subject line Re: [bug#33031] [PATCH] gnu: Use pypi.org.
has caused the debbugs.gnu.org bug report #33031,
regarding [PATCH] gnu: Use pypi.org.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
33031: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=33031
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> 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
>
>
>
>
> --- End Message ---

--- Begin Message --- Subject: Re: [bug#33031] [PATCH] gnu: Use pypi.org. Date: Thu, 18 Oct 2018 23:47:03 -0400 User-agent: Mutt/1.10.1 (2018-07-13)

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

Thanks! Pushed as 7277d06d8b956263ef1773c5f61e53dc65583ddd

signature.asc
Description: PGP signature

--- End Message ---