From 25a2f81f9b554e600f38ffaa89305cac3653d7a3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Sep 2016 22:44:03 +0300 Subject: gnu: python2-scikit-learn: Use strip-python2-variant. * gnu/packages/python.scm (python2-scikit-learn): Replace package definition with 'package-with-python2', using 'strip-python2-variant' to simplify the package definition. --- gnu/packages/python.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 09fe6273a3..15a2a391db 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2885,18 +2885,11 @@ and is very extensible.") (description "Scikit-learn provides simple and efficient tools for data mining and data analysis.") - (license license:bsd-3))) + (license license:bsd-3) + (properties `((python2-variant . ,(delay python2-scikit-learn)))))) (define-public python2-scikit-learn - (let ((scikit (package-with-python2 python-scikit-learn))) - (package (inherit scikit) - (propagated-inputs - `(("python2-numpy" ,python2-numpy) - ("python2-scipy" ,python2-scipy) - ,@(alist-delete - "python-numpy" - (alist-delete - "python-scipy" (package-propagated-inputs scikit)))))))) + (package-with-python2 (strip-python2-variant python-scikit-learn))) (define-public python-scikit-image (package -- cgit v1.3 From 7e21b9fb2625d3d5050acceea0fe433c48c00d76 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Sep 2016 22:46:31 +0300 Subject: gnu: python-scikit-learn: Set source file name. * gnu/packages/python.scm (python-scikit-learn)[source]: Add 'file-name' field. --- gnu/packages/python.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 15a2a391db..06de46b859 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2853,6 +2853,7 @@ and is very extensible.") (uri (string-append "https://github.com/scikit-learn/scikit-learn/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "140skabifgc7lvvj873pnzlwx0ni6q8qkrsyad2ccjb3h8rxzkih")))) -- cgit v1.3 From 2b031d3fc109c5b726d0711d948ee465f662f0a4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Sep 2016 23:06:42 +0300 Subject: gnu: python2-scikit-image: Use strip-python2-variant. * gnu/packages/python.scm (python2-scikit-image): Inherit using strip-python2-variant. [propagated-inputs]: Remove work-around for python2-matplotlib, python2-numpy, python2-scipy. --- gnu/packages/python.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 06de46b859..dd59be8f02 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2919,21 +2919,19 @@ mining and data analysis.") (synopsis "Image processing in Python") (description "Scikit-image is a collection of algorithms for image processing.") - (license license:bsd-3))) + (license license:bsd-3) + (properties `((python2-variant . ,(delay python2-scikit-image)))))) (define-public python2-scikit-image - (let ((scikit-image (package-with-python2 python-scikit-image))) + (let ((scikit-image (package-with-python2 + (strip-python2-variant python-scikit-image)))) (package (inherit scikit-image) (native-inputs `(("python2-mock" ,python2-mock) ,@(package-native-inputs scikit-image))) (propagated-inputs `(("python2-pytz" ,python2-pytz) - ("python2-matplotlib" ,python2-matplotlib) - ("python2-numpy" ,python2-numpy) - ("python2-scipy" ,python2-scipy) - ,@(fold alist-delete (package-propagated-inputs scikit-image) - '("python-matplotlib" "python-numpy" "python-scipy"))))))) + ,@(package-propagated-inputs scikit-image)))))) (define-public python-redis (package -- cgit v1.3 From fc1a170e65d721ed4cea35fdd4752678c21d5741 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Sep 2016 23:15:53 +0300 Subject: gnu: python2-numexpr: Use strip-python2-variant. * gnu/packages/python.scm (python2-numexpr): Replace package definition with 'package-with-python2', using 'strip-python2-variant'. --- gnu/packages/python.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index dd59be8f02..6e2c865f0e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3303,17 +3303,11 @@ doing the same calculation in Python. In addition, its multi-threaded capabilities can make use of all your cores, which may accelerate computations, most specially if they are not memory-bounded (e.g. those using transcendental functions).") - (license license:expat))) + (license license:expat) + (properties `((python2-variant . ,(delay python2-numexpr)))))) (define-public python2-numexpr - (let ((numexpr (package-with-python2 python-numexpr))) - (package (inherit numexpr) - ;; Make sure to use special packages for Python 2 instead - ;; of those automatically rewritten by package-with-python2. - (propagated-inputs - `(("python2-numpy" ,python2-numpy) - ,@(alist-delete "python-numpy" - (package-propagated-inputs numexpr))))))) + (package-with-python2 (strip-python2-variant python-numexpr))) (define-public python-matplotlib (package -- cgit v1.3 From 135ba811c6f55c22bfa8969143d83e7fdf166763 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Sep 2016 23:23:46 +0300 Subject: gnu: python2-ipython: Use strip-python2-variant. * gnu/packages/python.scm (python2-ipython): Inherit using strip-python2-variant. [propagated-inputs]: Remove work-around for python2-terminado. [inputs]: Remove work-around for python2-jsonschema, python2-matplotlib, python2-numpy, python2-requests. (python-inputs)[properties]: New field. --- gnu/packages/python.scm | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6e2c865f0e..8b52548065 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4387,29 +4387,20 @@ without using the configuration machinery.") Powerful interactive shells, a browser-based notebook, support for interactive data visualization, embeddable interpreters and tools for parallel computing.") - (license license:bsd-3))) + (license license:bsd-3) + (properties `((python2-variant . ,(delay python2-ipython)))))) (define-public python2-ipython - (let ((ipython (package-with-python2 python-ipython))) + (let ((ipython (package-with-python2 (strip-python2-variant python-ipython)))) (package (inherit ipython) ;; FIXME: some tests are failing (arguments `(#:tests? #f ,@(package-arguments ipython))) - ;; Make sure we use custom python2-NAME packages. ;; FIXME: add pyreadline once available. - (propagated-inputs - `(("python2-terminado" ,python2-terminado) - ,@(alist-delete "python-terminado" - (package-propagated-inputs ipython)))) (inputs - `(("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-jsonschema" "python-matplotlib" "python-numpy" "python-requests"))))))) + `(("python2-mock" ,python2-mock) + ,@(package-inputs ipython)))))) (define-public python-isodate (package -- cgit v1.3