From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id P1SECnSrzGA/BwAAgWs5BA (envelope-from ) for ; Fri, 18 Jun 2021 16:19:32 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id QNuTBXSrzGAjRgAA1q6Kng (envelope-from ) for ; Fri, 18 Jun 2021 14:19:32 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C023319F20 for ; Fri, 18 Jun 2021 16:19:31 +0200 (CEST) Received: from localhost ([::1]:44888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luFLG-0004fw-EQ for larch@yhetil.org; Fri, 18 Jun 2021 10:19:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luFKp-0004H7-0H for guix-patches@gnu.org; Fri, 18 Jun 2021 10:19:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45980) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luFKo-0006zY-A4 for guix-patches@gnu.org; Fri, 18 Jun 2021 10:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luFKo-0008Qi-7K for guix-patches@gnu.org; Fri, 18 Jun 2021 10:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49086] [PATCH] gnu: linkchecker: Update to 10.0.1. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 14:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49086 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac , 49086@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 49086-submit@debbugs.gnu.org id=B49086.162402590632361 (code B ref 49086); Fri, 18 Jun 2021 14:19:02 +0000 Received: (at 49086) by debbugs.gnu.org; 18 Jun 2021 14:18:26 +0000 Received: from localhost ([127.0.0.1]:57526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luFKD-0008Pt-Mt for submit@debbugs.gnu.org; Fri, 18 Jun 2021 10:18:26 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:45470 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luFKB-0008Pe-U8 for 49086@debbugs.gnu.org; Fri, 18 Jun 2021 10:18:25 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1624025896; bh=qkT+HNSuUYsjcovk2tB3N7Jt2gUr2P4rqy743V21EJY=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=VSH+qg1dB3GCdovIAI94HR15c4O//33cPtT2/NCov2IZ21mCxESdpNGPyagsuIX15 l3Wkpd0Iv8bkyCxY3LIy3zAXdakUdKVvfdREd5Or6RsbdxOrxdfYUZ4r5UXr0QJtiT 5q6GAjvF2OwrRd7Tdv8ujyxg3B5dNFnn5AlFnaAw= In-Reply-To: <20210618120023.14607-1-arunisaac@systemreboot.net> References: <20210618120023.14607-1-arunisaac@systemreboot.net> Date: Fri, 18 Jun 2021 16:18:15 +0200 Message-ID: <87eecz6yu0.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1624025971; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=x/dOmeldEpZeXhvyO3xm9qUjg7LDO5c6BVaj2U6Ndj8=; b=tNuaLALTmrUbHAXY1APH6y8aIzhb5GX/+3/vtLBoN36I78BxIvb9ZWeq1LXX7Kipm8RakZ OFfH0ozfFoxFviAQJIJUoZBDjPX/NYgVi2idUpjxNNyvIkaYt44ogZtl4Fxx54SQhfrPbo fYxFjcDuWMMv9e2ECprofW8MMNPFTs+vsqkmYi22//YPWTGTVU2eCrOTV4GuRtTwHkQU2B qJMcdvXKb8JXyuFNUmm2wUsltYDa39ZqHbwucBFztF+JiL5VL+dmIR27cA0KlSl3C4o7UM PJ8PvAb2+JPd3MRKKwtb9J70tRK4Lz9KXXkoZ8uhUBYeX0HrozLGJINDS4vM5Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624025971; a=rsa-sha256; cv=none; b=VXg5PQMekyQXOrTlV5fNhbBcJWJWHS4hVpN7rNewklO0D6CEMHdc1hXDWrZ7yKKJLYA73B yblqzpuUeSd08ltyzXI7Utg2W+jEBAM1vwOkcEpyLVNtYMD9xCR3EQC6tQjOYtwQV2ZDe0 DMAUWxyeZX1pbT0X7i4Pk4f04RXiptZafZuAPiovLsCp4RA3OjcIoZ8u8NoUA/2Bf4MmxW c3YTxdKN2L+Yxg+MgajGYWy4ca4tRuTnYKpIW7ssfFNZE2t7XKgdyRLV49WQ4smVOSbgcz v36oSExp5pLDRYR6Ow3JbJJhiUDiKGGoiL62Vfyn+O9UgYUTgi34mocTnrNC/A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=VSH+qg1d; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -3.43 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=VSH+qg1d; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C023319F20 X-Spam-Score: -3.43 X-Migadu-Scanner: scn0.migadu.com X-TUID: P/uU029H0SkN --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Fri, Jun 18 2021, Arun Isaac wrote: > * 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 inst= ead > of setting PYTHONPATH directly. > [home-page]: Update URI. > * gnu/packages/patches/linkchecker-tests-require-network.patch: Delete fi= le. > * gnu/local.mk (dist_patch_DATA): Unregister it. > --- > gnu/local.mk | 1 - > .../linkchecker-tests-require-network.patch | 182 ------------------ > gnu/packages/web.scm | 47 ++--- > 3 files changed, 16 insertions(+), 214 deletions(-) > delete mode 100644 gnu/packages/patches/linkchecker-tests-require-networ= k.patch > > (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 install= ed > - ;; 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 us= ed > - (setenv "PYTHONPATH" > - (string-append out "/lib/python2.7/site-packages" > - ":" > - (getenv "PYTHONPATH"))) > - ;; Remove this directory to avoid it being used when runn= ing > - ;; the tests > - (delete-file-recursively "linkcheck") > - > - (invoke "py.test" "tests")) > - #t))))) > - (home-page "https://linkcheck.github.io/linkchecker") > + (replace 'check > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (add-installed-pythonpath inputs outputs) > + (invoke "py.test" "tests")))))) This 'check phase doesn=E2=80=99t respect the =E2=80=98--with-tests=E2=80= =99 transformation. Something like the following would be better: (replace 'check (lambda* (#:key inputs outputs tests? #:allow-other-keys) (when tests? (with-directory-excursion "tests" (add-installed-pythonpath inputs outputs) (invoke "py.test" "tests"))))) Otherwise, LGTM. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEAVhh4yyK5+SEykIzrPUJmaL7XHkFAmDMqycVHHB1YmxpY0B5 b2N0b2NlbGwueHl6AAoJEKz1CZmi+1x514sP/iuNgHRD2QOjKwWvhmuj3rb0mWvS cU7x8TOpCUx7mFh3O4+SqOdGIk8Tdxo2Y0e/4nj7KoHutHK8oOGXCuheY8JvFQ3Z IWob7ww1v9Kz1/ocQBmACmnpp8GDGdZJ78npjucXCzuEZ7Ttw3yopSswFz9JtFTX r/J1Ijx5QXsxaTwY3Y6fyueF8YzaXfu0MjN6hl7Yt8PiZ+a0yThoLWMOU8kgkx/n L/4HF0dcFVWeWqNEwm1QFPjnwQTq1CiZRbU+px+1Ln/qluyvOyM0TtbRPkPIV5+U AJmYby8roI2Gn3c5tz8p7Ej2hPhf5zCSvESKDJ6DpqzLRbBMqR62S6Mh2uip32o5 rK+kh/IjANgC8VKX+9G/x/a98L0y50geEpGcSU9vJwGqOmiIN8pWCJ+Zw8ywpES2 6RsEUvowq1tycMXgSh9ip/Ll61JQ6FD2hTMdSECs1dYPY8u+v8aoKtwKMK/T/9jH X6zpsT5msPW5C/y/1G/rzTxnSNxhPDabeheV1FGqs9qMD0PQTrchvHCUxDXUxvyP i1W/Z2/g4hBX9sly8vsEm44ii8/IjiBdTQ3gzxZqySJU7rXqqD1iCUOzRLbUxJwK ELh+xVkswCxbZ7wFyrh3fywUEqwg6wgR83zYN+7lXZ4AT/f+nWKVrDGEYLIPayq+ Ew460YRnxvlQtNwn =NRLy -----END PGP SIGNATURE----- --=-=-=--