[PATCH] gnu: python-flask: Update to 0.11.1.

[PATCH] gnu: python-flask: Update to 0.11.1.

[Christopher Allan Webber]

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]

Note that the old URL scheme no longer seemed to work.

I'm not thrilled by the new URL "scheme".  It seems like more work to
update with each version bump.  I'm not sure what the solution is?

 - Chris


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-python-flask-Update-to-0.11.1.patch --]
[-- Type: text/x-patch, Size: 1766 bytes --]

From 33afef246e909d58253f120b0e2e41c4cc37483b Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Wed, 22 Jun 2016 13:31:54 -0500
Subject: [PATCH] gnu: python-flask: Update to 0.11.1.

* gnu/packages/python.scm (python-flask): Update to 0.11.1.
---
 gnu/packages/python.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 4567a91..18b619e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8424,18 +8424,23 @@ useful for solving the Assignment Problem.")
 (define-public python-flask
   (package
     (name "python-flask")
-    (version "0.10.1")
+    (version "0.11.1")
     (source (origin
               (method url-fetch)
-              (uri (pypi-uri "Flask" version))
+              (uri
+               (string-append
+                "https://pypi.python.org/packages/55/8a/"
+                "78e165d30f0c8bb5d57c429a30ee5749825ed461ad6c959688872643ffb3/"
+                "Flask-0.11.1.tar.gz"))
               (sha256
                (base32
-                "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc"))))
+                "03kbfll4sj3v5z7r31c7bhfpi11r1np076d4p1k2kg4yzcmkywdl"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-itsdangerous" ,python-itsdangerous)
        ("python-jinja2" ,python-jinja2)
-       ("python-werkzeug" ,python-werkzeug)))
+       ("python-werkzeug" ,python-werkzeug)
+       ("python-click" ,python-click)))
     (home-page "https://github.com/mitsuhiko/flask/")
     (synopsis "Microframework based on Werkzeug, Jinja2 and good intentions")
     (description "Flask is a micro web framework based on the Werkzeug toolkit
-- 
2.8.4

Re: [PATCH] gnu: python-flask: Update to 0.11.1.

[Leo Famulari]

On Wed, Jun 22, 2016 at 01:35:17PM -0500, Christopher Allan Webber wrote:
> Note that the old URL scheme no longer seemed to work.
> 
> I'm not thrilled by the new URL "scheme".  It seems like more work to
> update with each version bump.  I'm not sure what the solution is?

Please review Ben's 'pypi-origin' patch :)

http://lists.gnu.org/archive/html/guix-devel/2016-06/msg00724.html

>      (source (origin
>                (method url-fetch)
> -              (uri (pypi-uri "Flask" version))
> +              (uri
> +               (string-append
> +                "https://pypi.python.org/packages/55/8a/"
> +                "78e165d30f0c8bb5d57c429a30ee5749825ed461ad6c959688872643ffb3/"
> +                "Flask-0.11.1.tar.gz"))

In the meantime, I think it's best to keep the hash on its own line, to
reduce noise in the commit log if we do more updates in this format.

"55/8a/78e1..."

> -       ("python-werkzeug" ,python-werkzeug)))
> +       ("python-werkzeug" ,python-werkzeug)
> +       ("python-click" ,python-click)))

Remember to mention the new dependency in the commit message!

Re: [PATCH] gnu: python-flask: Update to 0.11.1.

[Christopher Allan Webber]

[-- Attachment #1: Type: text/plain, Size: 1279 bytes --]

Leo Famulari writes:

> On Wed, Jun 22, 2016 at 01:35:17PM -0500, Christopher Allan Webber wrote:
>> Note that the old URL scheme no longer seemed to work.
>> 
>> I'm not thrilled by the new URL "scheme".  It seems like more work to
>> update with each version bump.  I'm not sure what the solution is?
>
> Please review Ben's 'pypi-origin' patch :)
>
> http://lists.gnu.org/archive/html/guix-devel/2016-06/msg00724.html

I'll try to get to it soon, though I'm very short on time right now.

>>      (source (origin
>>                (method url-fetch)
>> -              (uri (pypi-uri "Flask" version))
>> +              (uri
>> +               (string-append
>> +                "https://pypi.python.org/packages/55/8a/"
>> +                "78e165d30f0c8bb5d57c429a30ee5749825ed461ad6c959688872643ffb3/"
>> +                "Flask-0.11.1.tar.gz"))
>
> In the meantime, I think it's best to keep the hash on its own line, to
> reduce noise in the commit log if we do more updates in this format.
>
> "55/8a/78e1..."
>
>> -       ("python-werkzeug" ,python-werkzeug)))
>> +       ("python-werkzeug" ,python-werkzeug)
>> +       ("python-click" ,python-click)))
>
> Remember to mention the new dependency in the commit message!

Okay.  New patch attached!  Look good enough? :)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-python-flask-Update-to-0.11.1.patch --]
[-- Type: text/x-patch, Size: 1802 bytes --]

From e1413c19106fe75916855f1514de21e5bc75cdb2 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Wed, 22 Jun 2016 13:31:54 -0500
Subject: [PATCH] gnu: python-flask: Update to 0.11.1.

* gnu/packages/python.scm (python-flask): Update to 0.11.1.
  Add python-click as a dependency.
---
 gnu/packages/python.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 4567a91..dd4adae 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8424,18 +8424,23 @@ useful for solving the Assignment Problem.")
 (define-public python-flask
   (package
     (name "python-flask")
-    (version "0.10.1")
+    (version "0.11.1")
     (source (origin
               (method url-fetch)
-              (uri (pypi-uri "Flask" version))
+              (uri
+               (string-append
+                "https://pypi.python.org/packages/"
+                "55/8a/78e165d30f0c8bb5d57c429a30ee5749825ed461ad6c959688872643ffb3/"
+                "Flask-0.11.1.tar.gz"))
               (sha256
                (base32
-                "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc"))))
+                "03kbfll4sj3v5z7r31c7bhfpi11r1np076d4p1k2kg4yzcmkywdl"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-itsdangerous" ,python-itsdangerous)
        ("python-jinja2" ,python-jinja2)
-       ("python-werkzeug" ,python-werkzeug)))
+       ("python-werkzeug" ,python-werkzeug)
+       ("python-click" ,python-click)))
     (home-page "https://github.com/mitsuhiko/flask/")
     (synopsis "Microframework based on Werkzeug, Jinja2 and good intentions")
     (description "Flask is a micro web framework based on the Werkzeug toolkit
-- 
2.8.4

[PATCH]: guix: python-build-system: Change pypi-uri to use https://pypi.io.

[宋文武]

[-- Attachment #1: Type: text/plain, Size: 1072 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Wed, Jun 22, 2016 at 01:35:17PM -0500, Christopher Allan Webber wrote:
>> Note that the old URL scheme no longer seemed to work.
>> 
>> I'm not thrilled by the new URL "scheme".  It seems like more work to
>> update with each version bump.  I'm not sure what the solution is?
>
> Please review Ben's 'pypi-origin' patch :)
>
> http://lists.gnu.org/archive/html/guix-devel/2016-06/msg00724.html
>
>>      (source (origin
>>                (method url-fetch)
>> -              (uri (pypi-uri "Flask" version))
>> +              (uri
>> +               (string-append
>> +                "https://pypi.python.org/packages/55/8a/"
>> +                "78e165d30f0c8bb5d57c429a30ee5749825ed461ad6c959688872643ffb3/"
>> +                "Flask-0.11.1.tar.gz"))
>
> In the meantime, I think it's best to keep the hash on its own line, to
> reduce noise in the commit log if we do more updates in this format.

Ah, nixpkgs use pypi.io for it, and it will redirect the old uri
scheme to the new one.

I guess we should do the same?



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-guix-python-build-system-Change-pypi-uri-to-use-http.patch --]
[-- Type: text/x-patch, Size: 1890 bytes --]

From 4605399da016c11314e8d4aef84f7007f82f8d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Thu, 23 Jun 2016 19:23:28 +0800
Subject: [PATCH] guix: python-build-system: Change pypi-uri to use
 https://pypi.io.

* guix/build-system/python.scm (pypi-uri): Use https://pypi.io.
* gnu/packages/python.scm (python-twisted)[uri]: Remove https://pypi.io.
---
 gnu/packages/python.scm      | 5 +----
 guix/build-system/python.scm | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 4567a91..8c34ff2 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -9097,10 +9097,7 @@ to provide a high-level synchronous API on top of the libev event loop.")
     (version "16.2.0")
     (source (origin
               (method url-fetch)
-              (uri (list (pypi-uri "Twisted" version ".tar.bz2") ; 404
-                         (string-append
-                          "https://pypi.io/packages/source/T/Twisted/"
-                          "Twisted-" version ".tar.bz2")))
+              (uri (pypi-uri "Twisted" version ".tar.bz2"))
               (sha256
                (base32
                 "0ydxrp9myw1mvsz3qfzx5579y5llmqa82pxvqchgp5syczffi450"))))
diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm
index c3d6c62..705943e 100644
--- a/guix/build-system/python.scm
+++ b/guix/build-system/python.scm
@@ -48,7 +48,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.python.org/packages/source/"
+  (string-append "https://pypi.io/packages/source/"
                  (string-take name 1) "/" name "/"
                  name "-" version extension))
 
-- 
2.8.4

Re: [PATCH]: guix: python-build-system: Change pypi-uri to use https://pypi.io.

[Ben Woodcroft]

On 23/06/16 21:39, 宋文武 wrote:
> Leo Famulari <leo@famulari.name> writes:
>
>> On Wed, Jun 22, 2016 at 01:35:17PM -0500, Christopher Allan Webber wrote:
>>> Note that the old URL scheme no longer seemed to work.
>>>
>>> I'm not thrilled by the new URL "scheme".  It seems like more work to
>>> update with each version bump.  I'm not sure what the solution is?
>> Please review Ben's 'pypi-origin' patch :)
>>
>> http://lists.gnu.org/archive/html/guix-devel/2016-06/msg00724.html
>>
>>>       (source (origin
>>>                 (method url-fetch)
>>> -              (uri (pypi-uri "Flask" version))
>>> +              (uri
>>> +               (string-append
>>> +                "https://pypi.python.org/packages/55/8a/"
>>> +                "78e165d30f0c8bb5d57c429a30ee5749825ed461ad6c959688872643ffb3/"
>>> +                "Flask-0.11.1.tar.gz"))
>> In the meantime, I think it's best to keep the hash on its own line, to
>> reduce noise in the commit log if we do more updates in this format.
> Ah, nixpkgs use pypi.io for it, and it will redirect the old uri
> scheme to the new one.
>
> I guess we should do the same?

This is a simpler solution than 'pypi-origin'. Thanks.

My only concern is that it is "pre-production", WDYT?

ben

Re: [PATCH]: guix: python-build-system: Change pypi-uri to use https://pypi.io.

[Ludovic Courtès]

iyzsong@member.fsf.org (宋文武) skribis:

> Leo Famulari <leo@famulari.name> writes:
>
>> On Wed, Jun 22, 2016 at 01:35:17PM -0500, Christopher Allan Webber wrote:
>>> Note that the old URL scheme no longer seemed to work.
>>> 
>>> I'm not thrilled by the new URL "scheme".  It seems like more work to
>>> update with each version bump.  I'm not sure what the solution is?
>>
>> Please review Ben's 'pypi-origin' patch :)
>>
>> http://lists.gnu.org/archive/html/guix-devel/2016-06/msg00724.html
>>
>>>      (source (origin
>>>                (method url-fetch)
>>> -              (uri (pypi-uri "Flask" version))
>>> +              (uri
>>> +               (string-append
>>> +                "https://pypi.python.org/packages/55/8a/"
>>> +                "78e165d30f0c8bb5d57c429a30ee5749825ed461ad6c959688872643ffb3/"
>>> +                "Flask-0.11.1.tar.gz"))
>>
>> In the meantime, I think it's best to keep the hash on its own line, to
>> reduce noise in the commit log if we do more updates in this format.
>
> Ah, nixpkgs use pypi.io for it, and it will redirect the old uri
> scheme to the new one.
>
> I guess we should do the same?

Sounds simple and efficient.  :-)

The problem with the ‘pypi-origin’ macro that Ben proposed is that it
would force us to maintain two hashes (SHA1 and SHA256) per package,
which is annoying.

> From 4605399da016c11314e8d4aef84f7007f82f8d75 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
> Date: Thu, 23 Jun 2016 19:23:28 +0800
> Subject: [PATCH] guix: python-build-system: Change pypi-uri to use
>  https://pypi.io.
>
> * guix/build-system/python.scm (pypi-uri): Use https://pypi.io.
> * gnu/packages/python.scm (python-twisted)[uri]: Remove https://pypi.io.
> ---
>  gnu/packages/python.scm      | 5 +----
>  guix/build-system/python.scm | 2 +-
>  2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 4567a91..8c34ff2 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -9097,10 +9097,7 @@ to provide a high-level synchronous API on top of the libev event loop.")
>      (version "16.2.0")
>      (source (origin
>                (method url-fetch)
> -              (uri (list (pypi-uri "Twisted" version ".tar.bz2") ; 404
> -                         (string-append
> -                          "https://pypi.io/packages/source/T/Twisted/"
> -                          "Twisted-" version ".tar.bz2")))
> +              (uri (pypi-uri "Twisted" version ".tar.bz2"))
>                (sha256
>                 (base32
>                  "0ydxrp9myw1mvsz3qfzx5579y5llmqa82pxvqchgp5syczffi450"))))
> diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm
> index c3d6c62..705943e 100644
> --- a/guix/build-system/python.scm
> +++ b/guix/build-system/python.scm
> @@ -48,7 +48,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.python.org/packages/source/"
> +  (string-append "https://pypi.io/packages/source/"
>                   (string-take name 1) "/" name "/"
>                   name "-" version extension))

LGTM!

Also, if pypi.python.org is now content-addressed, we could add a
‘pypi-fetch’ method based on ‘uri-fetch’, but with an additional
content-addressed mirror.  Thoughts?

Thanks,
Ludo’.