From 0a90bea34d76ea4cd51aea61876218d059830045 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 18 Jun 2021 17:16:18 +0530 Subject: gnu: linkchecker: Update to 10.0.1. * gnu/packages/web.scm (linkchecker): Update to 10.0.1. [source]: Remove patches. [inputs]: Add python-beautifulsoup4. Replace python2-dnspython-1.16, python2-pyxdg and python2-requests with python-dnspython, python-pyxdg and python-requests respectively. [native-inputs]: Replace python2-pytest, python2-miniboa and python2-parameterized with python-pytest, python-miniboa and python-parameterized respectively. [arguments]: Use python 3. Replace check phase instead of deleting the standard phase and adding a custom one. Use add-installed-pythonpath instead of setting PYTHONPATH directly. Support disabling of tests with tests?. [home-page]: Update URI. * gnu/packages/patches/linkchecker-tests-require-network.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Unregister it. --- gnu/packages/web.scm | 48 +++++++++++++++++------------------------------- 1 file changed, 17 insertions(+), 31 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d1f1d0f755..412308b417 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Clément Lassieur ;;; Copyright © 2016, 2017 Nikita -;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac +;;; Copyright © 2016, 2017, 2018, 2019, 2021 Arun Isaac ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2016 Bake Timmons ;;; Copyright © 2017 Thomas Danckaert @@ -6578,51 +6578,37 @@ Instagram and YouTube.") (define-public linkchecker (package (name "linkchecker") - (version "9.4.0") + (version "10.0.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/linkchecker/linkchecker") (commit (string-append "v" version)))) - (patches - (search-patches "linkchecker-tests-require-network.patch")) (file-name (git-file-name name version)) (sha256 (base32 - "03ihjmc4bqxxqv71bb43r2f23sx0xnbq1k2fsg9fw05qa5s9x187")))) + "1j97dc9a4yhpscwadhv5dxp7036pnrxiaky18l8ddr3pvxdjvkxs")))) (build-system python-build-system) (inputs - `(("python2-dnspython" ,python2-dnspython-1.16) - ("python2-pyxdg" ,python2-pyxdg) - ("python2-requests" ,python2-requests))) + `(("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-dnspython" ,python-dnspython) + ("python-pyxdg" ,python-pyxdg) + ("python-requests" ,python-requests))) (native-inputs `(("gettext" ,gettext-minimal) - ("python2-pytest" ,python2-pytest) - ("python2-miniboa" ,python2-miniboa) - ("python2-parameterized" ,python2-parameterized))) + ("python-pytest" ,python-pytest) + ("python-miniboa" ,python-miniboa) + ("python-parameterized" ,python-parameterized))) (arguments - `(#:python ,python-2 - #:phases + `(#: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 - (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))))) - (home-page "https://linkcheck.github.io/linkchecker") + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "py.test" "tests"))))))) + (home-page "https://linkchecker.github.io/linkchecker/") (synopsis "Check websites for broken links") (description "LinkChecker is a website validator. It checks for broken links in websites. It is recursive and multithreaded providing output in -- cgit v1.2.3