From 8621ff6bd58033a556c4dbd464b5c697445df8d0 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 22 Sep 2020 10:47:46 -0400 Subject: gnu: python-sympy: Update to 1.6.2. * gnu/packages/python-xyz.scm (python-sympy): Update to 1.6.2. [source]: Download from pypi. [arguments]: Make check phase inheritable by python2-sympy. (python2-sympy): Update to 1.5.1. [source]: Download from pypi. [arguments]: Inherit from python-sympy. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9cf226299d..b1a2ab5efd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7579,15 +7579,13 @@ (define-public python2-bigfloat (define-public python-sympy (package (name "python-sympy") - (version "1.1.1") + (version "1.6.2") (source (origin (method url-fetch) - (uri (string-append - "https://github.com/sympy/sympy/releases/download/sympy-" - version "/sympy-" version ".tar.gz")) + (uri (pypi-uri "sympy" version)) (sha256 - (base32 "190n29sppw7g8ihilc5451y7jlfcaw56crqiqbf1jff43dlmfnxc")))) + (base32 "0247skhkxanczpqqdz6n9k1axgpwl665b25hyn9vgr060p4dryhw")))) (build-system python-build-system) (arguments `(#:phases @@ -7598,7 +7596,9 @@ (define-public python-sympy (delete 'check) (add-after 'install 'check (lambda* (#:key outputs #:allow-other-keys) - (invoke "python3" "-c" "import sympy; sympy.test(\"/core\")") + (invoke + (or (which "python3") (which "python")) + "-c" "import sympy; sympy.test(\"/core\")") #t))))) (propagated-inputs `(("python-mpmath" ,python-mpmath))) @@ -7613,17 +7613,13 @@ (define-public python-sympy (define-public python2-sympy (package (inherit (package-with-python2 python-sympy)) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; Run the core tests after installation. By default it would run - ;; *all* tests, which take a very long time to complete and are known - ;; to be flaky. - (delete 'check) - (add-after 'install 'check - (lambda* (#:key outputs #:allow-other-keys) - (invoke "python" "-c" "import sympy; sympy.test(\"/core\")") - #t))))))) + (version "1.5.1") ; last release for python2 + (source + (origin + (method url-fetch) + (uri (pypi-uri "sympy" version)) + (sha256 + (base32 "0zjfbxlkazzh9z22gf62azrkipb2xw7mpzjz3wl1az9893bh2yfp")))))) (define-public python-q (package -- cgit v1.2.3