ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Remove duplicate python-pbr.

Browse source 
This is a follow-up to commit 1ef09c0c75.

* gnu/packages/openstack.scm (python-pbr, python2-pbr): Move from here ...
* gnu/packages/python.scm: ... to here.
(python-pbr, python2-pbr): Delete duplicate packages.
This commit is contained in:
Ben Woodcroft 2016-04-03 21:09:17 +10:00
parent 692add53bc
commit e25f017422
2 changed files with 35 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
gnu/packages/openstack.scm
View file

@ -20,7 +20,6 @@
(define-module (gnu packages openstack)
#:use-module (gnu packages python)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control)
#:use-module (guix build-system python)
#:use-module (guix download)
#:use-module ((guix licenses)
@ -235,48 +234,6 @@ (define-public python-os-testr
(define-public python2-os-testr
(package-with-python2 python-os-testr))
(define-public python-pbr
(package
(name "python-pbr")
(version "1.8.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://pypi.python.org/packages/source/p/pbr/pbr-"
version
".tar.gz"))
(sha256
(base32
"0jcny36cf3s8ar5r4a575npz080hndnrfs4np1fqhv0ym4k7c4p2"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;; Most tests seem to use the Internet.
(propagated-inputs
`(("python-testrepository" ,python-testrepository)
("git" ,git))) ;; pbr actually uses the "git" binary.
(inputs
`(("python-fixtures" ,python-fixtures)
("python-mimeparse" ,python-mimeparse)
("python-mock" ,python-mock)
("python-setuptools" ,python-setuptools)
("python-six" ,python-six)
("python-sphinx" ,python-sphinx)
("python-testrepository" ,python-testrepository)
("python-testresources" ,python-testresources)
("python-testscenarios" ,python-testscenarios)
("python-testtools" ,python-testtools)
("python-virtualenv" ,python-virtualenv)))
(home-page "https://launchpad.net/pbr")
(synopsis "Change the default behavior of Python’s setuptools")
(description
"Python Build Reasonableness (PBR) is a library that injects some useful
and sensible default behaviors into your setuptools run.")
(license asl2.0)))
(define-public python2-pbr
(package-with-python2 python-pbr))
(define-public python-requests-mock
(package
(name "python-requests-mock")

38
gnu/packages/python.scm
View file

@ -69,6 +69,7 @@ (define-module (gnu packages python)
#:use-module (gnu packages texlive)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control)
#:use-module (gnu packages web)
#:use-module (gnu packages base)
#:use-module (gnu packages xml)
@ -1875,25 +1876,46 @@ (define-public python2-pbr-0.11
(package-with-python2 python-pbr-0.11))
(define-public python-pbr
(package (inherit python-pbr-0.11)
(package
(name "python-pbr")
(version "1.8.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pbr" version))
(uri (string-append
"https://pypi.python.org/packages/source/p/pbr/pbr-"
version
".tar.gz"))
(sha256
(base32
"0jcny36cf3s8ar5r4a575npz080hndnrfs4np1fqhv0ym4k7c4p2"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;; Most tests seem to use the Internet.
(propagated-inputs
`(("python-testrepository" ,python-testrepository)
("git" ,git))) ;; pbr actually uses the "git" binary.
(inputs
`(("python-setuptools" ,python-setuptools)
("python-fixtures" ,python-fixtures)
("python-pip" ,python-pip)))
(properties `((python2-variant . ,(delay python2-pbr))))))
`(("python-fixtures" ,python-fixtures)
("python-mimeparse" ,python-mimeparse)
("python-mock" ,python-mock)
("python-setuptools" ,python-setuptools)
("python-six" ,python-six)
("python-sphinx" ,python-sphinx)
("python-testrepository" ,python-testrepository)
("python-testresources" ,python-testresources)
("python-testscenarios" ,python-testscenarios)
("python-testtools" ,python-testtools)
("python-virtualenv" ,python-virtualenv)))
(home-page "https://launchpad.net/pbr")
(synopsis "Change the default behavior of Python’s setuptools")
(description
"Python Build Reasonableness (PBR) is a library that injects some useful
and sensible default behaviors into your setuptools run.")
(license asl2.0)))
(define-public python2-pbr
(package (inherit (package-with-python2
(strip-python2-variant python-pbr)))))
(package-with-python2 python-pbr))
(define-public python-fixtures
(package