From b8e777efcfca32c5277d03812393c938e9424768 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 19 Mar 2020 02:11:28 +0100 Subject: gnu: python-glances: Update to 3.1.4. * gnu/packages/python-xyz.scm (python-glances): Update to 3.1.4. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c6d3e2ce19..b0417192bf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11959,13 +11959,13 @@ command @command{natsort} that exposes this functionality in the command line.") (define-public python-glances (package (name "python-glances") - (version "3.1.2") + (version "3.1.4") (source (origin (method url-fetch) (uri (pypi-uri "Glances" version)) (sha256 - (base32 "15384pbvw9wj4sb8zgvd9v1812vrypbyjg0acicjf1hdb3p30fkk")) + (base32 "0dc47gbvp9a3wxppdqihxpglxxaxbj3hcvzgcxxq8zcsciah3plq")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 16b8503f55f2e8869c5670e7cd361e69ac1db165 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 19 Mar 2020 02:12:20 +0100 Subject: gnu: Remove python2-glances variant. * gnu/packages/python-xyz.scm (python2-glances): Remove variable. --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b0417192bf..a2c3844d65 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11989,9 +11989,6 @@ Glances uses the PsUtil library to get information from your system. It monitors CPU, load, memory, network bandwidth, disk I/O, disk use, and more.") (license license:lgpl3+))) -(define-public python2-glances - (package-with-python2 python-glances)) - (define-public python-graphql-core (package (name "python-graphql-core") -- cgit v1.2.3 From 58d902741240d52d783e77ef3a0540642bd91e4c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 19 Mar 2020 02:20:40 +0100 Subject: gnu: glances: Deprecate python- prefix. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/package/python-xyz.scm (glances): New public variable renamed from…… (python-glances): …this now-deprecated one. --- gnu/packages/python-xyz.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a2c3844d65..86e87ae4dc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11956,9 +11956,9 @@ command @command{natsort} that exposes this functionality in the command line.") `(("python2-pathlib" ,python2-pathlib) ,@(package-native-inputs base)))))) -(define-public python-glances +(define-public glances (package - (name "python-glances") + (name "glances") (version "3.1.4") (source (origin @@ -11989,6 +11989,9 @@ Glances uses the PsUtil library to get information from your system. It monitors CPU, load, memory, network bandwidth, disk I/O, disk use, and more.") (license license:lgpl3+))) +(define-public python-glances + (deprecated-package "python-glances" glances)) + (define-public python-graphql-core (package (name "python-graphql-core") -- cgit v1.2.3 From baab9eef27994575e3ce1ba7efb822725600f748 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Mar 2020 08:29:06 +0100 Subject: gnu: python2-cython: Exclude parallel tests on i686 systems. * gnu/packages/python-xyz.scm (python2-cython)[arguments]: When building on i686-linux, override the 'check' phase. --- gnu/packages/python-xyz.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 86e87ae4dc..07199aa7ca 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3685,6 +3685,18 @@ writing C extensions for Python as easy as Python itself.") (substitute-keyword-arguments (package-arguments base) ((#:phases phases) `(modify-phases ,phases + ;; XXX: On i686-linux, running the parallel tests fails on many-core + ;; systems, see . + ;; TODO: Move this logic to the regular check phase in a future + ;; rebuild cycle. + ,@(if (string-prefix? "i686" (%current-system)) + '((replace 'check + (lambda _ + (setenv "CFLAGS" "-O0") + (invoke "python" "runtests.py" "-vv" + "-j" (number->string (parallel-job-count)) + "-x" "run.parallel")))) + '()) (add-before 'check 'adjust-test_embed (lambda _ (substitute* "runtests.py" -- cgit v1.2.3