diff options
Diffstat (limited to 'gnu/packages/statistics.scm')
| -rw-r--r-- | gnu/packages/statistics.scm | 48 |
1 files changed, 20 insertions, 28 deletions
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 599d6a8fc3..edb1bd4405 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2017 Alex Kost <[email protected]> ;;; Copyright © 2018 Alex Branham <[email protected]> ;;; Copyright © 2020 Tim Howes <[email protected]> +;;; Copyright © 2021 Maxim Cournoyer <[email protected]> ;;; Copyright © 2021 Bonface Munyoki Kilyungi <[email protected]> ;;; Copyright © 2021 Lars-Dominik Braun <[email protected]> ;;; Copyright © 2021 Frank Pursel <[email protected]> @@ -221,9 +222,8 @@ This package also provides @command{xls2csv} to export Excel files to CSV.") (("compress = TRUE") "compress = FALSE")))) (add-before 'configure 'patch-coreutils-paths (lambda* (#:key inputs #:allow-other-keys) - (let* ((coreutils (assoc-ref inputs "coreutils")) - (uname-bin (string-append coreutils "/bin/uname")) - (rm-bin (string-append coreutils "/bin/rm"))) + (let ((uname-bin (search-input-file inputs "/bin/uname")) + (rm-bin (search-input-file inputs "/bin/rm"))) (substitute* "src/scripts/R.sh.in" (("uname") uname-bin)) (substitute* "src/unix/sys-std.c" @@ -304,8 +304,8 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\ (lambda* (#:key inputs #:allow-other-keys) (setenv "TZ" "UTC+1") (setenv "TZDIR" - (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo")))) + (search-input-directory inputs + "share/zoneinfo")))) (add-after 'build 'make-info (lambda _ (invoke "make" "info"))) (add-after 'build 'install-info @@ -345,18 +345,19 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\ ("perl" ,perl) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo) ; for building HTML manuals - ("texlive" ,(texlive-union (list texlive-ae + ("texlive" ,(texlive-updmap.cfg (list texlive-ae texlive-inconsolata texlive-fonts-ec - texlive-amsfonts/patched + texlive-grfext + texlive-amsfonts texlive-latex-base texlive-latex-fancyvrb texlive-latex-graphics - texlive-latex-hyperref - texlive-latex-oberdiek + texlive-hyperref + texlive-oberdiek texlive-latex-tools texlive-latex-upquote - texlive-latex-url + texlive-url texlive-latex-xkeyval))) ("tzdata" ,tzdata-for-tests) ("xz" ,xz))) @@ -1952,25 +1953,26 @@ and fast file reading.") (define-public python-patsy (package (name "python-patsy") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (pypi-uri "patsy" version)) (sha256 (base32 - "149rbrdzwns0ay88caf1zsm1r53v1q5np1mrb36na50y432cw5gi")))) + "17dn72519gvwifw3i8mzwlslxmxkl8ihzfrxg1iblsk70iwdwlsh")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (invoke "nosetests" "-v")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? (invoke "pytest" "-vv"))))))) (propagated-inputs `(("python-numpy" ,python-numpy) ("python-scipy" ,python-scipy) ("python-six" ,python-six))) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-pytest" ,python-pytest))) (home-page "https://github.com/pydata/patsy") (synopsis "Describe statistical models and build design matrices") (description @@ -6145,25 +6147,15 @@ to any arbitrary string. In this case, it is up to you to set valid values.") "1cysswxr5glrdblyl2zsmywcj7xhxn3wmyihxinrz9gm8gmaacax")))) (build-system python-build-system) (arguments - '(#:modules ((ice-9 ftw) - (srfi srfi-1) - (srfi srfi-26) - (guix build utils) - (guix build python-build-system)) - #:phases + '(#:phases (modify-phases %standard-phases (replace 'check (lambda* (#:key outputs inputs #:allow-other-keys) (let ((cwd (getcwd))) - (setenv "TZ" "UTC") - (setenv "PYTHONPATH" - (string-append cwd "/build/" - (find (cut string-prefix? "lib" <>) - (scandir (string-append cwd "/build"))) - ":" - (getenv "PYTHONPATH")))) + (setenv "TZ" "UTC")) ;; test_vector_complex has issues when run in our environment. - (invoke "pytest" "-v" "rpy2/tests/" "-k" "not test_vector_complex")))))) + (invoke "pytest" "-v" "rpy2/tests/" + "-k" "not test_vector_complex")))))) (propagated-inputs `(("python-cffi" ,python-cffi) ("python-six" ,python-six) |