From 7ca0dbc3f063ef26c6eff87ec9661eab84af5c85 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 27 Feb 2015 23:53:57 +0100 Subject: gnu: python2-py2cairo: Rename to python2-pycairo. * gnu/packages/gtk.scm (python2-py2cairo): Rename to ... (python2-pycairo): ... this (python2-pygtk): Adapt input. * gnu/packages/glib.scm (python2-pygobject-2): Adapt input. * gnu/packages/python.scm (package-with-python2): Adapt input. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index bbff241833..014e592203 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2290,7 +2290,7 @@ toolkits.") ;; Make sure we use exactly PYTHON2-NUMPYDOC, which is ;; customized for Python 2. (propagated-inputs - `(("python2-py2cairo" ,python2-py2cairo) + `(("python2-pycairo" ,python2-pycairo) ("python2-pygobject-2" ,python2-pygobject-2) ,@(alist-delete "python-pycairo" (alist-delete "python-pygobject" -- cgit v1.3 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(-) (limited to 'gnu/packages/python.scm') 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 @@ that client code uses to construct the grammar directly in Python code.") 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 @@ that client code uses to construct the grammar directly in Python code.") (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.3 From 88c268347beeb503b1809ba1ac7eee0cb1305661 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 28 Feb 2015 01:17:57 +0100 Subject: gnu: python: Drop special handling of python2-numpydoc as input. * gnu/packages/python.scm (python2-numpy, python2-matplotlib, python2-ipython): Keep input python2-numpydoc created by package-with-python2. --- gnu/packages/python.scm | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7c12ebf6d2..d438525ac4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2078,14 +2078,11 @@ capabilities.") (define-public python2-numpy (let ((numpy (package-with-python2 python-numpy))) (package (inherit numpy) - ;; Make sure we use exactly PYTHON2-NUMPYDOC, which is customized for - ;; Python 2. Since it is also an input to PYTHON2-MATPLOTLIB, we need to - ;; import the right version of 'matplotlib' as well. - (inputs `(("python2-numpydoc" ,python2-numpydoc) - ("python2-matplotlib" ,python2-matplotlib) - ,@(alist-delete "python-numpydoc" - (alist-delete "python-matplotlib" - (package-inputs numpy)))))))) + ;; Make sure we use exactly PYTHON2-MATPLOTLIB, which is customized for + ;; Python 2. + (inputs `(("python2-matplotlib" ,python2-matplotlib) + ,@(alist-delete "python-matplotlib" + (package-inputs numpy))))))) (define-public python-pyparsing (package @@ -2289,19 +2286,15 @@ toolkits.") (define-public python2-matplotlib (let ((matplotlib (package-with-python2 python-matplotlib))) (package (inherit matplotlib) - ;; Make sure we use exactly PYTHON2-NUMPYDOC, which is - ;; customized for Python 2. + ;; Make sure to use special packages for Python 2 instead + ;; of those automatically rewritten by package-with-python2. (propagated-inputs `(("python2-pycairo" ,python2-pycairo) ("python2-pygobject-2" ,python2-pygobject-2) ,@(alist-delete "python-pycairo" (alist-delete "python-pygobject" (package-propagated-inputs - matplotlib))))) - (inputs - `(("python2-numpydoc" ,python2-numpydoc) - ,@(alist-delete "python-numpydoc" - (package-inputs matplotlib))))))) + matplotlib)))))))) (define-public python-scipy (package @@ -2819,11 +2812,9 @@ computing.") (package (inherit ipython) ;; Make sure we use custom python2-NAME packages. (inputs - `(("python2-numpydoc" ,python2-numpydoc) - ("python2-matplotlib" ,python2-matplotlib) - ,@(alist-delete "python-numpydoc" - (alist-delete "python-matplotlib" - (package-inputs ipython)))))))) + `(("python2-matplotlib" ,python2-matplotlib) + ,@(alist-delete "python-matplotlib" + (package-inputs ipython))))))) (define-public python-isodate (package -- cgit v1.3