apteryx pushed a commit to branch cu/farewell-to-pythonpath in repository guix.
commit 17fc1aa40ca978df306d7176cd0eedb25670f98c Author: Maxim Cournoyer <[email protected]> AuthorDate: Fri Jan 22 11:59:08 2021 -0500 gnu: bamm: Update following changes to the Python build system. * gnu/packages/bioinformatics.scm (bamm): Delete trailing #t. [phases]{check}: Override rather than delete phase. Remove trailing #t. {post-install-check}: Delete phase. {wrap-executable}: Also wrap with the new GUIX_PYTHONPATH. --- gnu/packages/bioinformatics.scm | 46 ++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b32a15a..b371cab 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2018 Joshua Sierles, Nextjournal <[email protected]> ;;; Copyright © 2018 Gábor Boskovits <[email protected]> ;;; Copyright © 2018, 2019, 2020 Mădălin Ionel Patrașcu <[email protected]> -;;; Copyright © 2019, 2020 Maxim Cournoyer <[email protected]> +;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <[email protected]> ;;; Copyright © 2019 Brian Leung <[email protected]> ;;; Copyright © 2019 Brett Gilio <[email protected]> ;;; Copyright © 2020 Björn Höfling <[email protected]> @@ -208,8 +208,7 @@ structure of the predicted RNA.") (snippet `(begin ;; Delete bundled htslib. - (delete-file-recursively "c/htslib-1.3.1") - #t)))) + (delete-file-recursively "c/htslib-1.3.1"))))) (build-system python-build-system) (arguments `(#:python ,python-2 ; BamM is Python 2 only. @@ -229,37 +228,22 @@ structure of the predicted RNA.") ;; Use autogen so that 'configure' works. (substitute* "autogen.sh" (("/bin/sh") sh)) (setenv "CONFIG_SHELL" sh) - (invoke "./autogen.sh"))) - #t)) - (delete 'build) - ;; Run tests after installation so compilation only happens once. - (delete 'check) - (add-after 'install 'wrap-executable - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (path (getenv "PATH"))) - (wrap-program (string-append out "/bin/bamm") - `("PATH" ":" prefix (,path)))) - #t)) - (add-after 'wrap-executable 'post-install-check - (lambda* (#:key inputs outputs #:allow-other-keys) - (setenv "PATH" - (string-append (assoc-ref outputs "out") - "/bin:" - (getenv "PATH"))) - (setenv "PYTHONPATH" - (string-append - (assoc-ref outputs "out") - "/lib/python" - (string-take (string-take-right - (assoc-ref inputs "python") 5) 3) - "/site-packages:" - (getenv "PYTHONPATH"))) + (invoke "./autogen.sh"))))) + (delete 'build) ;the build loops otherwise + (replace 'check + (lambda _ ;; There are 2 errors printed, but they are safe to ignore: ;; 1) [E::hts_open_format] fail to open file ... ;; 2) samtools view: failed to open ... - (invoke "nosetests") - #t))))) + (invoke "nosetests"))) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (path (getenv "PATH")) + (pythonpath (getenv "GUIX_PYTHONPATH"))) + (wrap-program (string-append out "/bin/bamm") + `("PATH" ":" prefix (,path)) + `("GUIX_PYTHONPATH" ":" prefix (,pythonpath))))))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake)
