From a3bfb867380f1e5ce157334d7d9877297ef509ab Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 17:22:35 -0400 Subject: gnu: python-scipy: Update to 1.10.1. * gnu/packages/python-science.scm (python-scipy): Update to 1.10.1. [build-system]: Use pyproject-build-system. [arguments]: Add #:build-backend argument. Remove loosen-requirements, build and install phases. [native-inputs]: Remove python-pypa-build. --- gnu/packages/python-science.scm | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) (limited to 'gnu/packages/python-science.scm') diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 58d127277c..37beb5ed61 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2022 Efraim Flashner ;;; Copyright © 2016-2020, 2022 Marius Bakke ;;; Copyright © 2019 Tobias Geerinckx-Rice -;;; Copyright © 2019, 2021, 2022 Maxim Cournoyer +;;; Copyright © 2019, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2020 Pierre Langlois ;;; Copyright © 2020, 2021, 2022 Vinicius Monego @@ -76,38 +76,29 @@ (define-module (gnu packages python-science) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) - #:use-module (guix build-system python)) + #:use-module (guix build-system python) + #:use-module (guix build-system pyproject)) (define-public python-scipy (package (name "python-scipy") - (version "1.9.1") + (version "1.10.1") (source (origin (method url-fetch) (uri (pypi-uri "scipy" version)) (sha256 - (base32 "1jcb94xal7w7ax80kaivqqics36v8smi4a3xngyxbrh0i538rli6")))) - (build-system python-build-system) + (base32 "19gk88nvrxl050nasz25qpmmqvbdk247bkj09jx8jibv1awdzy9c")))) + (build-system pyproject-build-system) (arguments (list + ;; FIXME: The default 'mesonpy' build system doesn't seem to work with + ;; our pyproject-build-system, errors with: AttributeError: 'list' + ;; object has no attribute 'items' (see: + ;; https://issues.guix.gnu.org/62781). + #:build-backend "setuptools.build_meta" #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'loosen-requirements - (lambda _ - (substitute* "pyproject.toml" - (("numpy==") "numpy>=") - (("meson==") "meson>=")))) - (replace 'build - (lambda _ - ;; ZIP does not support timestamps before 1980. - (setenv "SOURCE_DATE_EPOCH" "315532800") - (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) - (replace 'install - (lambda _ - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl)))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -157,7 +148,6 @@ (define-public python-scipy meson-python pkg-config python-cython - python-pypa-build python-pytest python-pytest-xdist python-threadpoolctl)) -- cgit v1.2.3