nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-system/python: Return #t from all phases. 

* guix/build/python-build-system.scm (build, install, wrap): Return #t.
(check): Return #t and remove vestigial plumbing.
This commit is contained in:
Mark H Weaver 2018-03-18 00:25:09 -04:00
parent 953468743f
commit 1e62645402
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
guix/build/python-build-system.scm
View File

@ -128,7 +128,8 @@
(define* (build #:key use-setuptools? #:allow-other-keys) (define* (build #:key use-setuptools? #:allow-other-keys)
"Build a given Python package." "Build a given Python package."
(call-setuppy "build" '() use-setuptools?)) (call-setuppy "build" '() use-setuptools?)
#t)
(define* (check #:key tests? test-target use-setuptools? #:allow-other-keys) (define* (check #:key tests? test-target use-setuptools? #:allow-other-keys)
"Run the test suite of a given Python package." "Run the test suite of a given Python package."
@ -138,15 +139,12 @@
;; (given with `package_dir`). This will by copied to the output, too, ;; (given with `package_dir`). This will by copied to the output, too,
;; so we need to remove. ;; so we need to remove.
(let ((before (find-files "build" "\\.egg-info$" #:directories? #t))) (let ((before (find-files "build" "\\.egg-info$" #:directories? #t)))
(if (call-setuppy test-target '() use-setuptools?) (call-setuppy test-target '() use-setuptools?)
(let* ((after (find-files "build" "\\.egg-info$" #:directories? #t)) (let* ((after (find-files "build" "\\.egg-info$" #:directories? #t))
(inter (lset-difference eqv? after before))) (inter (lset-difference eqv? after before)))
(for-each delete-file-recursively inter) (for-each delete-file-recursively inter)))
#t) (format #t "test suite not run~%"))
#f)) #t)
(begin
(format #t "test suite not run~%")
#t)))
(define (get-python-version python) (define (get-python-version python)
(let* ((version (last (string-split python #\-))) (let* ((version (last (string-split python #\-)))
@ -183,7 +181,8 @@ when running checks after installing the package."
"--root=/") "--root=/")
'()) '())
configure-flags))) configure-flags)))
(call-setuppy "install" params use-setuptools?))) (call-setuppy "install" params use-setuptools?)
#t))
(define* (wrap #:key inputs outputs #:allow-other-keys) (define* (wrap #:key inputs outputs #:allow-other-keys)
(define (list-of-files dir) (define (list-of-files dir)
@ -212,7 +211,8 @@ when running checks after installing the package."
(let ((files (list-of-files dir))) (let ((files (list-of-files dir)))
(for-each (cut wrap-program <> var) (for-each (cut wrap-program <> var)
files))) files)))
bindirs))) bindirs)
#t))
(define* (rename-pth-file #:key name inputs outputs #:allow-other-keys) (define* (rename-pth-file #:key name inputs outputs #:allow-other-keys)
"Rename easy-install.pth to NAME.pth to avoid conflicts between packages "Rename easy-install.pth to NAME.pth to avoid conflicts between packages