guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

30/163: gnu: linkchecker: Do not set PYTHONPATH.


From: guix-commits
Subject: 30/163: gnu: linkchecker: Do not set PYTHONPATH.
Date: Mon, 25 Jan 2021 02:01:22 -0500 (EST)

apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.

commit ebfeeb6a85a736c3a45b63674ad9e9a68b66e131
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Jan 22 16:58:17 2021 -0500

    gnu: linkchecker: Do not set PYTHONPATH.
    
    * gnu/packages/web.scm (linkchecker): Remove trailing #t.
    [phases]: Do not reorder the check phase after the install phase.
    {check}: Do not set PYTHONPATH.
---
 gnu/packages/web.scm | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 029a05d..44405d4 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -47,6 +47,7 @@
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -6431,23 +6432,13 @@ Instagram and YouTube.")
      `(#:python ,python-2
        #:phases
        (modify-phases %standard-phases
-         ;; Move the 'check phase to after 'install, so that the installed
-         ;; library can be used
-         (delete 'check)
-         (add-after 'install 'check
+         (replace 'check
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
-               ;; Set PYTHONPATH so that the installed linkchecker is used
-               (setenv "PYTHONPATH"
-                       (string-append out "/lib/python2.7/site-packages"
-                                      ":"
-                                      (getenv "PYTHONPATH")))
                ;; Remove this directory to avoid it being used when running
                ;; the tests
                (delete-file-recursively "linkcheck")
-
-               (invoke "py.test" "tests"))
-             #t)))))
+               (invoke "py.test" "tests")))))))
     (home-page "https://linkcheck.github.io/linkchecker";)
     (synopsis "Check websites for broken links")
     (description "LinkChecker is a website validator.  It checks for broken



reply via email to

[Prev in Thread] Current Thread [Next in Thread]