From 5e4d8f67100d066420e0fe5478f4d4ac62a57bfd Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 28 Feb 2015 01:08:37 +0100 Subject: gnu: python-numpydoc: Drop one test. * gnu/packages/python.scm (python-numpydoc): Drop one test for all Python versions. (python2-numpydoc): Define it by package-with-python2 without modifications. --- gnu/packages/python.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 014e592203..7c12ebf6d2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2147,7 +2147,15 @@ (define-public python-numpydoc version ".tar.gz")) (sha256 (base32 - "0d4dnifaxkll50jx6czj05y8cb4ny60njd2wz299sj2jxfy51w4k")))) + "0d4dnifaxkll50jx6czj05y8cb4ny60njd2wz299sj2jxfy51w4k")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Drop a test requiring matplotlib, which we cannot add as an + ;; input since it would create a circular dependency: Extend the + ;; test for Python 3, where it is already dropped, to Python 2. + (substitute* "numpydoc/tests/test_plot_directive.py" + (("3") "2")))))) (build-system python-build-system) (inputs `(("python-setuptools" ,python-setuptools) @@ -2162,13 +2170,7 @@ (define-public python-numpydoc (license bsd-2))) (define-public python2-numpydoc - (package - (inherit (package-with-python2 python-numpydoc)) - ;; With python-2 1 test (out of 30) fails because it doesn't find - ;; matplotlib. With python-3 it seems to detect at run-time the absence - ;; of matplotlib. - (arguments `(#:tests? #f - #:python ,python-2)))) + (package-with-python2 python-numpydoc)) (define-public python-matplotlib (package -- cgit v1.2.3