[PATCH v2 0/4] Update Flask & co

[PATCH v2 0/4] Update Flask & co

[Danny Milosavljevic]

Danny Milosavljevic (4):
  gnu: python-simplejson: Update to 3.10.0.
  gnu: python-pyopenssl: Update to 16.2.0.
  gnu: python-flask: Update to 0.11.1.
  gnu: python2-flask: Pick up python-flask's native-inputs.

 gnu/packages/python.scm | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

[PATCH v2 1/4] gnu: python-simplejson: Update to 3.10.0.

[Danny Milosavljevic]

* gnu/packages/python.scm (python-simplejson): Update to 3.10.0.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 83ef372..418a644 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1181,14 +1181,14 @@ after Andy Lester’s Perl module WWW::Mechanize.")
 (define-public python-simplejson
   (package
     (name "python-simplejson")
-    (version "3.8.2")
+    (version "3.10.0")
     (source
      (origin
       (method url-fetch)
       (uri (pypi-uri "simplejson" version))
       (sha256
        (base32
-        "0zylrnax8b6r0ndgni4w9c599fi6wm9vx5g6k3ddqfj3932kk16m"))))
+        "1qhwsykjlb85igb4cfl6v6gkprzbbg8gyqdd7zscc8w3x0ifcfwm"))))
     (build-system python-build-system)
     (home-page "http://simplejson.readthedocs.org/en/latest/")
     (synopsis

[PATCH v2 2/4] gnu: python-pyopenssl: Update to 16.2.0.

[Danny Milosavljevic]

* gnu/packages/python.scm (python-pyopenssl): Update to 16.2.0.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 418a644..ad27934 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6723,14 +6723,14 @@ message digests and key derivation functions.")
 (define-public python-pyopenssl
   (package
     (name "python-pyopenssl")
-    (version "16.1.0")
+    (version "16.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pyOpenSSL" version))
        (sha256
         (base32
-         "0prm06zz7hl6bk5s2lqzw25lq6smayfv2fgiliw2rbqxlyiavxw8"))))
+         "0vji4yrfshs15xpczbhzhasnjrwcarsqg87n98ixnyafnyxs6ybp"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-cryptography" ,python-cryptography)

[PATCH v2 3/4] gnu: python-flask: Update to 0.11.1.

[Danny Milosavljevic]

* gnu/packages/python.scm (python-flask): Update to 0.11.1.
[native-inputs]: Add python-click.
---
 gnu/packages/python.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index ad27934..497da52 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -9558,18 +9558,20 @@ 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))
               (sha256
                (base32
-                "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc"))))
+                "03kbfll4sj3v5z7r31c7bhfpi11r1np076d4p1k2kg4yzcmkywdl"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-itsdangerous" ,python-itsdangerous)
        ("python-jinja2" ,python-jinja2)
        ("python-werkzeug" ,python-werkzeug)))
+    (native-inputs
+     `(("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

[PATCH v2 4/4] gnu: python2-flask: Pick up python-flask's native-inputs.

[Danny Milosavljevic]

* gnu/packages/python.scm (python2-flask)[native-inputs]:
  Pick up python-flask's native-inputs.
---
 gnu/packages/python.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 497da52..39b40e7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -9581,9 +9581,11 @@ presume or force a developer to use a particular tool or library.")
     (properties `((python2-variant . ,(delay python2-flask))))))
 
 (define-public python2-flask
-  (package (inherit (package-with-python2
-                     (strip-python2-variant python-flask)))
-    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))
+  (let ((base (package-with-python2 (strip-python2-variant python-flask))))
+    (package
+      (inherit base)
+      (native-inputs `(("python2-setuptools" ,python2-setuptools)
+                       ,@(package-native-inputs base))))))
 
 (define-public python-cookies
   (package

Re: [PATCH v2 4/4] gnu: python2-flask: Pick up python-flask's native-inputs.

[Efraim Flashner]

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

On Sun, Nov 27, 2016 at 09:53:20AM +0100, Danny Milosavljevic wrote:
> * gnu/packages/python.scm (python2-flask)[native-inputs]:
>   Pick up python-flask's native-inputs.
> ---
>  gnu/packages/python.scm | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 497da52..39b40e7 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -9581,9 +9581,11 @@ presume or force a developer to use a particular tool or library.")
>      (properties `((python2-variant . ,(delay python2-flask))))))
>  
>  (define-public python2-flask
> -  (package (inherit (package-with-python2
> -                     (strip-python2-variant python-flask)))
> -    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))
> +  (let ((base (package-with-python2 (strip-python2-variant python-flask))))
> +    (package
> +      (inherit base)
> +      (native-inputs `(("python2-setuptools" ,python2-setuptools)
> +                       ,@(package-native-inputs base))))))
>  
>  (define-public python-cookies
>    (package
> 

This patch can be included with the previous one, since python- and
python2- are essentially two parts of the same package.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v2 4/4] gnu: python2-flask: Pick up python-flask's native-inputs.

[Hartmut Goebel]

Am 03.12.2016 um 21:38 schrieb Efraim Flashner:
> > +      (native-inputs `(("python2-setuptools" ,python2-setuptools)
> > +                       ,@(package-native-inputs base))))))
> >  

There is no need for adding setuptools here. It is now included in our
base python installation, even for Python 2. There is no need for adding
it here.

guix lint should tell you so :-)

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |