01/01: python2-jsonschema: Add python2-functools32 to inputs.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 264ae686fae658c90716632715846d34aa61b9f3
Author: Efraim Flashner <address@hidden>
Date:   Mon Jan 18 12:54:52 2016 +0200

    python2-jsonschema: Add python2-functools32 to inputs.
    
    * gnu/packages/python.scm (python2-jsonschema)[inputs]: Add
    python2-functools32.
    (python2-wheel)[native-inputs]: Specify python2-jsonschema. Add
    python2-functools32.
    (python2-requests)[propagated-inputs]: Specify python2-wheel.
    (python2-ipython)[inputs]: Specify python2-jsonschema, python2-requests.
    (python2-rauth)[propagated-inputs]: Specify python2-requests.
    * gnu/packages/openstack.scm (python2-requests-mock)[propagated-inputs]:
    Specify python2-requests.
    (python2-tempest-lib)[propagated-inputs]: Specify python2-jsonschema.
    (python2-oslosphinx)[propagated-inputs]: Specify python2-requests.
    (python2-keystoneclient)[porpagated-inputs]: Specify python2-requests.
    [native-inputs]: Specify python2-oslosphinx, python2-requests-mock,
    python2-tempest-lib.
    (python2-swiftclient)[propagated-inputs]: Specify python2-requests,
    python2-oslosphinx.
---
 gnu/packages/openstack.scm |   42 +++++++++++++++++++++++++++++++-----------
 gnu/packages/python.scm    |   30 ++++++++++++++++++++++++------
 2 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 392ff88..e258b89 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Cyril Roelandt <address@hidden>
-;;; Copyright © 2015 Efraim Flashner <address@hidden>
+;;; Copyright © 2015, 2016 Efraim Flashner <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -304,7 +304,12 @@ portions of your testing code.")
     (license asl2.0)))
 
 (define-public python2-requests-mock
-  (package-with-python2 python-requests-mock))
+  (let ((requests-mock (package-with-python2 python-requests-mock)))
+    (package (inherit requests-mock)
+      (propagated-inputs
+       `(("python2-requests" ,python2-requests)
+         ,@(alist-delete "python-requests"
+                         (package-propagated-inputs requests-mock)))))))
 
 (define-public python-stevedore
   (package
@@ -387,7 +392,12 @@ common features used in Tempest.")
     (license asl2.0)))
 
 (define-public python2-tempest-lib
-  (package-with-python2 python-tempest-lib))
+  (let ((tempest-lib (package-with-python2 python-tempest-lib)))
+    (package (inherit tempest-lib)
+      (propagated-inputs
+       `(("python2-jsonschema", python2-jsonschema)
+         ,@(alist-delete "python-jsonschema"
+                         (package-propagated-inputs tempest-lib)))))))
 
 ;; Packages from the Oslo library
 (define-public python-oslo.config
@@ -596,7 +606,9 @@ from the OpenStack project.")
     (license asl2.0)))
 
 (define-public python2-oslosphinx
-  (package-with-python2 python-oslosphinx))
+  (let ((oslosphinx (package-with-python2 python-oslosphinx)))
+    (package (inherit oslosphinx)
+      (propagated-inputs `(("python2-requests" ,python2-requests))))))
 
 (define-public python-oslotest
   (package
@@ -745,11 +757,17 @@ LDAP.")
 (define-public python2-keystoneclient
   (let ((keystoneclient (package-with-python2 python-keystoneclient)))
     (package (inherit keystoneclient)
+      (propagated-inputs
+       `(("python2-requests" ,python2-requests)
+         ,@(alist-delete "python-requests"
+                         (package-propagated-inputs keystoneclient))))
       (native-inputs
        `(("python2-oauthlib" ,python2-oauthlib)
-         ,@(alist-delete
-            "python-oauthlib"
-            (package-native-inputs keystoneclient)))))))
+         ("python2-oslosphinx" ,python2-oslosphinx)
+         ("python2-requests-mock" ,python2-requests-mock)
+         ("python2-tempest-lib" ,python2-tempest-lib)
+         ,@(fold alist-delete (package-native-inputs keystoneclient)
+            '("python-oauthlib" "python-oslosphinx" "python-requests-mock" 
"python-tempest-lib")))))))
 
 (define-public python-swiftclient
   (package
@@ -798,9 +816,11 @@ permanence.")
     (package (inherit swiftclient)
       (propagated-inputs
        `(("python2-futures" ,python2-futures)
-         ,@(package-propagated-inputs swiftclient)))
+         ("python2-requests" ,python2-requests)
+         ,@(alist-delete "python-requests"
+                         (package-propagated-inputs swiftclient))))
       (native-inputs
        `(("python2-keystoneclient" ,python2-keystoneclient)
-         ,@(alist-delete
-            "python-keystoneclient"
-            (package-native-inputs swiftclient)))))))
+         ("python2-oslosphinx" ,python2-oslosphinx)
+         ,@(fold alist-delete (package-native-inputs swiftclient)
+            '("python-keystoneclient" "python-oslosphinx")))))))
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a1757a0..813711a 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14,7 +14,7 @@
 ;;; Copyright © 2015 Leo Famulari <address@hidden>
 ;;; Copyright © 2015 Ben Woodcroft <address@hidden>
 ;;; Copyright © 2015, 2016 Erik Edrosa <address@hidden>
-;;; Copyright © 2015 Efraim Flashner <address@hidden>
+;;; Copyright © 2015, 2016 Efraim Flashner <address@hidden>
 ;;; Copyright © 2015 Kyle Meyer <address@hidden>
 ;;; Copyright © 2015 Chris Marusich <address@hidden>
 ;;;
@@ -2144,7 +2144,13 @@ installed with a newer @code{pip} or with wheel's own 
command line utility.")
     (license license:expat)))
 
 (define-public python2-wheel
-  (package-with-python2 python-wheel))
+  (let ((wheel (package-with-python2 python-wheel)))
+    (package (inherit wheel)
+      (native-inputs
+       `(("python2-functools32" ,python2-functools32)
+         ("python2-jsonschema" ,python2-jsonschema)
+         ,@(alist-delete "python-jsonschema"
+                         (package-native-inputs wheel)))))))
 
 (define-public python-requests
   (package
@@ -2184,7 +2190,12 @@ than Python’s urllib2 library.")
                "0gdr9dxm24amxpbyqpbh3lbwxc2i42hnqv50sigx568qssv3v2ir"))))))
 
 (define-public python2-requests
-  (package-with-python2 python-requests))
+  (let ((requests (package-with-python2 python-requests)))
+    (package (inherit requests)
+      (propagated-inputs
+       `(("python2-wheel" ,python2-wheel)
+         ,@(alist-delete "python-wheel"
+                         (package-propagated-inputs requests)))))))
 
 (define-public python-vcversioner
   (package
@@ -2234,7 +2245,11 @@ version numbers.")
     (license license:expat)))
 
 (define-public python2-jsonschema
-  (package-with-python2 python-jsonschema))
+  (let ((jsonschema (package-with-python2 python-jsonschema)))
+    (package (inherit jsonschema)
+      (inputs
+       `(("python2-functools32" ,python2-functools32)
+         ,@(package-inputs jsonschema))))))
 
 (define-public python-unidecode
   (package
@@ -4290,11 +4305,13 @@ computing.")
          ,@(alist-delete "python-terminado"
                          (package-propagated-inputs ipython))))
       (inputs
-       `(("python2-mock" ,python2-mock)
+       `(("python2-jsonschema" ,python2-jsonschema)
+         ("python2-mock" ,python2-mock)
          ("python2-matplotlib" ,python2-matplotlib)
          ("python2-numpy" ,python2-numpy)
+         ("python2-requests" ,python2-requests)
          ,@(fold alist-delete (package-inputs ipython)
-                 '("python-matplotlib" "python-numpy")))))))
+                 '("python-jsonschema" "python-matplotlib" "python-numpy" 
"python-requests")))))))
 
 (define-public python-isodate
   (package
@@ -7144,6 +7161,7 @@ authenticated session objects providing things like 
keep-alive.")
 (define-public python2-rauth
   (let ((rauth (package-with-python2 python-rauth)))
     (package (inherit rauth)
+      (propagated-inputs `(("python2-requests" ,python2-requests)))
       (native-inputs
        `(("python2-unittest2", python2-unittest2)
          ,@(package-native-inputs rauth))))))