aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-02-27 17:09:43 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-02-28 13:58:42 +0100
commitbc69104a442e1dd2338397a54a3a80eff170e78f (patch)
tree538609dec66e1b28ebfd1279db250e6c610b2976 /gnu/packages
parent151f32a74bb50461f701fce8b4ac233ca311fdc4 (diff)
downloadguix-bc69104a442e1dd2338397a54a3a80eff170e78f.tar
guix-bc69104a442e1dd2338397a54a3a80eff170e78f.tar.gz
gnu: python-testresources: Update to 2.0.1.
* gnu/packages/check.scm (python-testresources-bootstrap, python2-testresources-bootstrap): New public variables. (python-testresources): Adjust accordingly. [propagated-inputs]: Add PYTHON-PBR. [native-inputs]: Add PYTHON-FIXTURES and PYTHON-TESTTOOLS. * gnu/packages/python.scm (python-pbr)[native-inputs]: Replace PYTHON-TESTRESOURCES with PYTHON-TESTRESOURCES-BOOTSTRAP.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/check.scm47
-rw-r--r--gnu/packages/python.scm2
2 files changed, 34 insertions, 15 deletions
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index fbb89ce496..0a7d888d46 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -908,28 +908,47 @@ style tests.")
(define-public python2-testscenarios
(package-with-python2 python-testscenarios))
-(define-public python-testresources
+;; Testresources requires python-pbr at runtime, but pbr needs it for its
+;; own tests. Hence this bootstrap variant.
+(define-public python-testresources-bootstrap
(package
- (name "python-testresources")
- (version "0.2.7")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://pypi.python.org/packages/source/t/testresources/testresources-"
- version ".tar.gz"))
- (sha256
- (base32
- "0cbj3plbllyz42c4b5xxgwaa7mml54lakslrn4kkhinxhdri22md"))))
+ (name "python-testresources-bootstrap")
+ (version "2.0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "testresources" version))
+ (sha256
+ (base32
+ "05s4dsli9g17m1r3b1gvwicbbgq011hnpb2b9qnj27ja2n11k7gf"))))
(build-system python-build-system)
+ (arguments '(#:tests? #f))
+ (propagated-inputs
+ `(("python-pbr" ,python-pbr-minimal)))
(home-page "https://launchpad.net/testresources")
(synopsis
"Pyunit extension for managing test resources")
(description
- "Testresources is an extension to Python's unittest to allow declarative
-use of resources by test cases.")
+ "This package is only here for bootstrapping purposes. Use the regular
+testresources package instead.")
(license (list license:bsd-3 license:asl2.0)))) ; at the user's option
+(define-public python2-testresources-bootstrap
+ (package-with-python2 python-testresources-bootstrap))
+
+(define-public python-testresources
+ (package
+ (inherit python-testresources-bootstrap)
+ (name "python-testresources")
+ (propagated-inputs
+ `(("python-pbr" ,python-pbr)))
+ (arguments '())
+ (native-inputs
+ `(("python-fixtures" ,python-fixtures)
+ ("python-testtols" ,python-testtools)))
+ (description
+ "Testresources is an extension to Python's unittest to allow declarative
+use of resources by test cases.")))
+
(define-public python2-testresources
(package-with-python2 python-testresources))
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index efe8e8c638..22160bcfaa 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1695,7 +1695,7 @@ code introspection, and logging.")
("python-six" ,python-six)
("python-sphinx" ,python-sphinx)
("python-testrepository" ,python-testrepository-bootstrap)
- ("python-testresources" ,python-testresources)
+ ("python-testresources" ,python-testresources-bootstrap)
("python-testscenarios" ,python-testscenarios)
("python-testtools" ,python-testtools)
("python-virtualenv" ,python-virtualenv)))