Commit 264ae686 authored by Efraim Flashner's avatar Efraim Flashner
Browse files

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.
parent 058247ef
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
......@@ -304,7 +304,12 @@ (define-public python-requests-mock
(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 @@ (define-public python-tempest-lib
(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 @@ (define-public python-oslosphinx
(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 @@ (define-public python-keystoneclient
(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 @@ (define-public python2-swiftclient
(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")))))))
......@@ -14,7 +14,7 @@
;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
;;; Copyright © 2015 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2015, 2016 Erik Edrosa <erik.edrosa@gmail.com>
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2015 Chris Marusich <cmmarusich@gmail.com>
;;;
......@@ -2144,7 +2144,13 @@ (define-public python-wheel
(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 @@ (define-public python-requests-2.7
"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 @@ (define-public python-jsonschema
(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 @@ (define-public python2-ipython
,@(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 @@ (define-public python-rauth
(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))))))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment