From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 18 20:32:09 2023 Received: (at submit) by debbugs.gnu.org; 19 Jan 2023 01:32:10 +0000 Received: from localhost ([127.0.0.1]:42121 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIJmj-0001RY-KQ for submit@debbugs.gnu.org; Wed, 18 Jan 2023 20:32:09 -0500 Received: from lists.gnu.org ([209.51.188.17]:36330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIJmi-0001RR-7G for submit@debbugs.gnu.org; Wed, 18 Jan 2023 20:32:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIJmi-0005cz-0K for guix-patches@gnu.org; Wed, 18 Jan 2023 20:32:08 -0500 Received: from cascadia.aikidev.net ([2600:3c01:e000:267:0:a171:de7:c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIJmf-0002WV-P4 for guix-patches@gnu.org; Wed, 18 Jan 2023 20:32:07 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 4C8291AB68 for ; Wed, 18 Jan 2023 17:32:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1674091920; bh=8nzJi92vlQGtokjCHS0vDggVVzHvHmIyWTFiK9/Qa0c=; h=From:To:Subject:Date:From; b=igwmHQ/rkTsjJOb9kTf+Yd0R76OK6DBQG8HAiKkEc7LEOZU7x7vSEJu0qxz7gjAAl voByMgsFdYP/DqDUaVxiKPW5ZIfJVl9gymv9vZj0PGv3nUc0vs1O6bjpd+5A6iUU9T ojFV7fZ2mzcBqi+qJLrPoMNVVL0iwMIxZVHo0wjJkRMBq4qkkHvL118UwZb4QnjrH7 639ad3R9/sDoWZgl/NmZEuIinTMrOUPbwzpOyMfYEoyVqL8SR62mw3YF2GFOGe6opt 1kBWg9QLdSfjHlYps0XAfg7QeFbLvbeuKG6F8Jd9YDQT1E+aBVZqNFuKKDmqlD96Dm /VU/KhOkJW/xQ== From: Vagrant Cascadian To: guix-patches@gnu.org Subject: Update diffoscope to 232 Date: Wed, 18 Jan 2023 17:31:55 -0800 Message-ID: <87ilh3z4vo.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2600:3c01:e000:267:0:a171:de7:c; envelope-from=vagrant@reproducible-builds.org; helo=cascadia.aikidev.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-=-= Content-Type: text/plain Working on updating diffoscope to 232. Mostly routine changes. Notable differences are: * Needed a newer version of python-pypdf, as the python-pypdf2 included in guix is too old, referred to as PyPDF2 1.x, newer versions include PyPDF2 2.x or PyPdf2 3.x... It is also not PyPDF 1.x or PyPDF 2.x, which are very old, and I am not sure where PyPDF3 or PyPDF4 fit in, but they exist and one is even packaged in guix... For clarity, and I try to say this without laughing, this new package is based on the very recently released PyPDF 3.2.1. * Added lzip to native-inputs and upsteam code * Dropped mono from upstream code The upstream diffoscope changes were pushed to git upstream, so can eventually be dropped once diffoscope 233+ is eventually released. I have less hope for soring out the pypdf versioning madness. live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCY8idjAAKCRDcUY/If5cW quP+AQD7cNZ584ODqJxJp43e2YRsMw5pR00cuy9mBTZ9mn7t4wD/aphZIhgjwfi/ InIYZFdq94nel/p/hYVaGNVI8ZpcqgA= =Ca2/ -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 18 20:37:08 2023 Received: (at 60941) by debbugs.gnu.org; 19 Jan 2023 01:37:08 +0000 Received: from localhost ([127.0.0.1]:42134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIJrY-0001ZS-5b for submit@debbugs.gnu.org; Wed, 18 Jan 2023 20:37:08 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:39600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIJrV-0001Yx-S2 for 60941@debbugs.gnu.org; Wed, 18 Jan 2023 20:37:06 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 96D8A1AB68 for <60941@debbugs.gnu.org>; Wed, 18 Jan 2023 17:36:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1674092219; bh=g4YppAYOMliOubPpwj9hqsHuXAdJVOIrqM/m/Wrpn7o=; h=From:To:Subject:In-Reply-To:References:Date:From; b=v3Elibg071+iVgs/7i4/BD/mD2hE5zBAcDGS8jyJZmH1DVDImPTNt0pMjNbtpmWQm P5FqdGmVy0CwHLXWeibe2S7eYvclpXYmqjM0joiQlEQ7A8jmOOGDIVQw0+SnYr0oVs R5MJICjjM828iJ2v5w+jvm/Mq3X7498Mi17aGXF9EZQYZPYqnNtTwm4Xm/8wZptO0o MJUV2Rl3R/yy0TVRSV8O10EhkRMnjWHOQ1XaGlpuwcDSCCkduZuNj4KYjcBU125RWw WWQJSYt0L20fxeqQ2CUtDL3+Dw+fS9L7x1xQILKWiC+mTkDI5qlRr6+789RS4zM3B4 WiY66Ot6T7yKA== From: Vagrant Cascadian To: 60941@debbugs.gnu.org Subject: [PATCH 1/2] gnu: Add python-pypdf. In-Reply-To: References: <87ilh3z4vo.fsf@contorta> Date: Wed, 18 Jan 2023 17:36:54 -0800 Message-ID: <87edrrz4nd.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60941 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-Add-python-pypdf.patch Content-Transfer-Encoding: quoted-printable From=20e2082819efee20a72b026eebcfc14af279e424c7 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 18 Jan 2023 16:26:41 -0800 Subject: [PATCH 1/2] gnu: Add python-pypdf. * gnu/packages/pdf.scm (python-pypdf): New varaible. =2D-- gnu/packages/pdf.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 4b9d0623fe..cb94c29bde 100644 =2D-- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -1260,6 +1260,45 @@ (define-public pdf2svg converter using the Poppler and Cairo libraries.") (license license:gpl2+))) =20 +(define-public python-pypdf + (package + (name "python-pypdf") + (version "3.2.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "pypdf" version)) + (sha256 + (base32 + "1pdq4nbkknx61pk8w75jvx5j921m2676wfkyizsrap5mj92cssxc")))) + (build-system python-build-system) + (arguments + (list #:tests? #f ;pypi source does not contains tests + #:phases #~(modify-phases %standard-phases + (replace 'build + (lambda _ + (invoke "flit" "build"))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-key= s) + (add-installed-pythonpath inputs outputs) + (for-each (lambda (wheel) + (invoke "python" + "-m" + "pip" + "install" + wheel + (string-append "--prefix= =3D" + #$output))) + (find-files "dist" "\\.whl$"))))))) + (native-inputs (list python-flit)) + (propagated-inputs (list python-typing-extensions)) + (home-page "https://github.com/py-pdf/pypdf") + (synopsis + "A pure-python PDF library") + (description + "This package provides a pure-python PDF library capable of splitting= , merging, +cropping, and transforming PDF files") + (license license:bsd-3))) + (define-public python-pypdf2 (package (name "python-pypdf2") =2D-=20 2.39.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCY8ietwAKCRDcUY/If5cW qnW3AQCJsIBepTqyHR97PPA4J7jSJK4tENZx/RbkSczl38lm1QEA7uoTsvr3quIq g3UQW5lxsI8yVGV7M8MR0X2btBMS7QY= =M40p -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 18 20:38:14 2023 Received: (at 60941) by debbugs.gnu.org; 19 Jan 2023 01:38:14 +0000 Received: from localhost ([127.0.0.1]:42138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIJsb-0001bD-KO for submit@debbugs.gnu.org; Wed, 18 Jan 2023 20:38:13 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:60100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIJsZ-0001b1-LO for 60941@debbugs.gnu.org; Wed, 18 Jan 2023 20:38:12 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id C8AA61AB68 for <60941@debbugs.gnu.org>; Wed, 18 Jan 2023 17:38:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1674092284; bh=k0RQpkdKKEhoqiZrsHqeqlapJOimXGTW3qupV7GQ4SE=; h=From:To:Subject:In-Reply-To:References:Date:From; b=3aaAJJpHTAAPf3w/pWgFDebqhnBQtmi6syM1Db64/yf0cuBMO6Z/y7S4M+bdxrU2S M/oyALOOoNFZl/qQ1eIP4ahRrrjXr3BajGv/3FFAf5Ajaiwu9x0grCcDnrnh+X7qxu ZilCNwJhZTEGbh/UNJrQySSNQEJOuemEtKKSMLcu6OUAPRYCtXeKjCyMk4BGXbYJ+d FSAKZO0ap9RVxdpc6QJgaUkXziS9ZSZEFck+68XQNOC56uWuE/QcexH2U+tJkqomAz EMjnkY2+d163Ao9hB57wHyelPi2eUNRfy/Fv6MUwRLInZ0Wad5Hxq/s8NMm4yNr49C J201mTsADZfBg== From: Vagrant Cascadian To: 60941@debbugs.gnu.org Subject: [PATCH 2/2] gnu: diffoscope: Update to 232. In-Reply-To: <87edrrz4nd.fsf@contorta> References: <87ilh3z4vo.fsf@contorta> <87edrrz4nd.fsf@contorta> Date: Wed, 18 Jan 2023 17:38:00 -0800 Message-ID: <87a62fz4lj.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60941 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-gnu-diffoscope-Update-to-232.patch Content-Transfer-Encoding: quoted-printable From=20784d33dad1ff114e4f8043b7b766c785e7fef79f Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 18 Jan 2023 11:00:46 -0800 Subject: [PATCH 2/2] gnu: diffoscope: Update to 232. * gnu/packages/diffoscope.scm (diffoscope): Update to 232. [native-inputs]: Add lzip and python-pdf, drop python-pypdf2. [phases]: Add lzip-external-tool and remove-mono-external-tool. =2D-- gnu/packages/diffoscope.scm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index f730d976fe..59875c2e8e 100644 =2D-- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -75,7 +75,7 @@ (define-module (gnu packages diffoscope) (define-public diffoscope (package (name "diffoscope") =2D (version "224") + (version "232") (source (origin (method git-fetch) @@ -84,7 +84,7 @@ (define-public diffoscope (commit version))) (file-name (git-file-name name version)) (sha256 =2D (base32 "1qdivsf4yygg2az5018pw0q4169zas3hfqjydd0q3bhdrfpl0q4q")) + (base32 "0zix2m1rlgj7kyx8bkfjb9dnc5idblz6xhmxqq0w3jpnkxxjj8yq")) (patches (search-patches "diffoscope-fix-llvm-test.patch")))) (build-system python-build-system) @@ -112,6 +112,21 @@ (define-public diffoscope (string-append "[\"" (which "stat") "\",")) (("\\[\"getfacl\",") (string-append "[\"" (which "getfacl") "\","))))) + (add-after 'unpack 'lzip-external-tool + ;; Fixed upstream, remove this phase when updating to + ;; diffoscope 233 + (lambda _ + (substitute* "diffoscope/external_tools.py" + ((".debian.: .lzip.") + "\"debian\": \"lzip\", \"guix\": \"lzip\"")))) + (add-after 'unpack 'remove-mono-external-tool + ;; Fixed upstream, remove this phase when updating to + ;; diffoscope 233 + (lambda _ + (substitute* "diffoscope/external_tools.py" + ;; "guix": "mono", + ((".guix.: .mono.,") + "")))) (add-after 'build 'build-man-page (lambda* (#:key (make-flags '()) #:allow-other-keys) (apply invoke "make" "-C" "doc" make-flags))) @@ -160,7 +175,7 @@ (define-public diffoscope python-pytest python-chardet python-h5py =2D python-pypdf2 + python-pypdf python-progressbar33 =20 abootimg @@ -195,6 +210,7 @@ (define-public diffoscope libarchive llvm-9 lz4 + lzip ocaml odt2txt openssh =2D-=20 2.39.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCY8ie+AAKCRDcUY/If5cW ql8qAP9AGfllaFnK0LEg96nnZeyK6Fxa2XEtqqTKWxFykotbzAEA0D7iqvnPrI2H lz9gFZxosHLS01wI9FDrxXoq5xy2/wY= =ISJT -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 18 20:42:22 2023 Received: (at 60941) by debbugs.gnu.org; 19 Jan 2023 01:42:22 +0000 Received: from localhost ([127.0.0.1]:42148 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIJwc-0001hU-BD for submit@debbugs.gnu.org; Wed, 18 Jan 2023 20:42:22 -0500 Received: from mail-qt1-f176.google.com ([209.85.160.176]:41794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIJwZ-0001hE-Ek for 60941@debbugs.gnu.org; Wed, 18 Jan 2023 20:42:21 -0500 Received: by mail-qt1-f176.google.com with SMTP id d16so476784qtw.8 for <60941@debbugs.gnu.org>; Wed, 18 Jan 2023 17:42:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=A2izewa1ne9YY3qnrXBQsl7FQue/bCr/ndDI0Pwx1iI=; b=aVBszKjTXegsLoJhpDvVX6dGuEv7nxG5rXrDaYxGwkMyIrp4Z8QIGO6Itwio5RFCS5 L9vkIJIBHpDdI1MEUjcGQuOCheNgJI/YpcEXRsT/bm/Na7ToBNpRQ7qGIKCMx0NOk27C 6a/FP1xwX1tstXX05MrLZWpF3RtTXxd+2QF58NHrf8AoebwlR7WmdliBOIg73ZbTN+QJ LUstq0me2/ZA5BNkcqSkjvxkdte6DbzbETlp+/tn+6qBWROc7zII4C9Y1h0f+UC18upI qwoBiZ6HYDZM4UdwKU/TJtMgDvXi2T+M2YZ3Qsxkd4ABoWcTznGrC2jRYCRxRRdGZoNN /BpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=A2izewa1ne9YY3qnrXBQsl7FQue/bCr/ndDI0Pwx1iI=; b=12GgwCfPSZg9BlVGH8G76SABjjScSsWVTWMZk0uM1aarOa2Vg11vvifflMw29Q83Js 5FJltNiCAgP8Ie/7bEgy3/smkv6y4meHqan/DGvEMmcTTjorwZeKieAVuZbPO+4fzhlv rCJAZjmQnLZO4tH6MP4E1gYcv58qsT/epwvq0nTgGfCsofYi9RA0xDVFBv9dcWhbl/Zz dqL75SbhnLpsTY6g7GBlPENjN0AJUwkFCFyEwRzWRIX2mQVj7kj83xsytVBKs5URnByX +lKHHNnyJufz+fOtwe+f/XlbLO30l36C+zlPGtqLTMG1bhKnC27Y+byjfqWeohbJWi92 y62w== X-Gm-Message-State: AFqh2koxyLWfXVNJyqHwNaI4nt1w8+sQLQrtYBci8rnzCZLUvnaCbKqe uV2bK5hKzd+xP1vxWW7FSuKp7AuiTTxfYYew X-Google-Smtp-Source: AMrXdXtc95LDCmDkL2IysMgnFUaMz7hAPbGU02TJjIuVNgcH4v5i/J1veoMWHAj93sxp2czXrZkWLw== X-Received: by 2002:a05:622a:5086:b0:3b6:2b38:e075 with SMTP id fp6-20020a05622a508600b003b62b38e075mr12991353qtb.9.1674092532958; Wed, 18 Jan 2023 17:42:12 -0800 (PST) Received: from hurd ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id l6-20020ac81486000000b003a981f7315bsm18303640qtj.44.2023.01.18.17.42.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 17:42:12 -0800 (PST) From: Maxim Cournoyer To: Vagrant Cascadian Subject: Re: [bug#60941] [PATCH 1/2] gnu: Add python-pypdf. References: <87ilh3z4vo.fsf@contorta> <87edrrz4nd.fsf@contorta> Date: Wed, 18 Jan 2023 20:42:11 -0500 In-Reply-To: <87edrrz4nd.fsf@contorta> (Vagrant Cascadian's message of "Wed, 18 Jan 2023 17:36:54 -0800") Message-ID: <87pmbbe1vw.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60941 Cc: 60941@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Vagrant Cascadian writes: > From e2082819efee20a72b026eebcfc14af279e424c7 Mon Sep 17 00:00:00 2001 > From: Vagrant Cascadian > Date: Wed, 18 Jan 2023 16:26:41 -0800 > Subject: [PATCH 1/2] gnu: Add python-pypdf. > > * gnu/packages/pdf.scm (python-pypdf): New varaible. > --- > gnu/packages/pdf.scm | 39 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 39 insertions(+) > > diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm > index 4b9d0623fe..cb94c29bde 100644 > --- a/gnu/packages/pdf.scm > +++ b/gnu/packages/pdf.scm > @@ -1260,6 +1260,45 @@ (define-public pdf2svg > converter using the Poppler and Cairo libraries.") > (license license:gpl2+))) > > +(define-public python-pypdf > + (package > + (name "python-pypdf") > + (version "3.2.1") > + (source (origin > + (method url-fetch) > + (uri (pypi-uri "pypdf" version)) > + (sha256 > + (base32 > + "1pdq4nbkknx61pk8w75jvx5j921m2676wfkyizsrap5mj92cssxc")))) > + (build-system python-build-system) You should use pyproject-build-system, which knows how to build a project from a PEP 517 build system. > + (arguments > + (list #:tests? #f ;pypi source does not contains tests When this occurs, you can fetch from git instead. Typically Python packages come with test suites, and this one is no exception. > + #:phases #~(modify-phases %standard-phases > + (replace 'build > + (lambda _ > + (invoke "flit" "build"))) > + (replace 'install > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (add-installed-pythonpath inputs outputs) > + (for-each (lambda (wheel) > + (invoke "python" > + "-m" > + "pip" > + "install" > + wheel > + (string-append "--prefix=" > + #$output))) > + (find-files "dist" "\\.whl$"))))))) > + (native-inputs (list python-flit)) > + (propagated-inputs (list python-typing-extensions)) > + (home-page "https://github.com/py-pdf/pypdf") > + (synopsis > + "A pure-python PDF library") guix lint should complain about the leading determinant ("A"). > + (description > + "This package provides a pure-python PDF library capable of splitting, merging, > +cropping, and transforming PDF files") Missing period, and "pure-python" is odd. Perhaps just "This package provides a Python PDF library [...]" -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 18 20:48:32 2023 Received: (at 60941) by debbugs.gnu.org; 19 Jan 2023 01:48:32 +0000 Received: from localhost ([127.0.0.1]:42152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIK2a-0001vb-7l for submit@debbugs.gnu.org; Wed, 18 Jan 2023 20:48:32 -0500 Received: from mail-qt1-f182.google.com ([209.85.160.182]:35672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIK2X-0001vJ-Gv for 60941@debbugs.gnu.org; Wed, 18 Jan 2023 20:48:30 -0500 Received: by mail-qt1-f182.google.com with SMTP id g9so514441qtu.2 for <60941@debbugs.gnu.org>; Wed, 18 Jan 2023 17:48:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=tggyaPjJ68aidOd4x2RIVGy9q+Hv4mPRdCbNtMqV4zY=; b=oUUrQRq8UHW3RiY/kuclnePGHn4tekvO6jeENknEOi7kNhr3aoSGkNXkqHgZ3dPsr0 cUCxGJEbNDd0v1x8n50e3NUw4Sc69iu/EaFpRvDzU4nnaFiir8RX2BV4GDSuoOW3G8tZ w6YDXzLPwk8iuyVa3cnXjwN+DxoeOMqIVlZQuAppOCDVZ5LhY8C78bRH1irkRuYcia4A aTT7eVtLAdTRfFAfjTHkQ40IUPZksrxOQ+FVOePwalYCdIStMlz4HqslCS9/q8XVxTn7 2ylCPpWc0eh6Fq2GjDM4uDGYPtOsmdH/jTY/4sgohi/BLMqL15nYYxYh05D+Ic69FNwW GMag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=tggyaPjJ68aidOd4x2RIVGy9q+Hv4mPRdCbNtMqV4zY=; b=T7ZGvMeDs0q3FNa5aKnrhfN3CMvP93hL4BbcAWvYSJA/BWERISHxdgTCYKwkVNtdf4 AZmW7dFrwiK5/8Rya/VLj5km6Q9HdwbkpxH9t9/3n5h6yXGGph/oh4JnpTtDyZ2eEE1a fRlBQpHg+741hHABmVrCTHrW2AevD8U/LryQXRyYMLz//XETaJRGg6H9OohMGq6h4ZBZ QOOihTkAtxxHPuSQXikYX0S4Nr2GvA47dn3Or0zurtiQm14hmUwIfzGc3OK8W73mTp6o cW7m8SvJ0XBloQHmW+wHnT54fl1ioq0dS8HalQZ/OJDZsgzfzgKubvUTGFr/vVOiU0Bj eE6A== X-Gm-Message-State: AFqh2koXgfKzzd2UYy9+GC9bNHf0qtKZCOrsqyag/xfu6BVaYClaFASB NNex0seG2NUt3SE1VYG+Cy3hMfztxp5d1e2+ X-Google-Smtp-Source: AMrXdXt6eY8DlmGxAK37NcJ/3MuaXBAUQVYU1PeKakPu6A2FazC6ltbAawJPFGfluZ6hdV65ocQZwQ== X-Received: by 2002:ac8:5287:0:b0:3b6:2bb3:fb53 with SMTP id s7-20020ac85287000000b003b62bb3fb53mr12772960qtn.16.1674092903661; Wed, 18 Jan 2023 17:48:23 -0800 (PST) Received: from hurd ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id z26-20020ac8101a000000b003a70a675066sm18139603qti.79.2023.01.18.17.48.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 17:48:23 -0800 (PST) From: Maxim Cournoyer To: Vagrant Cascadian Subject: Re: bug#60941: Update diffoscope to 232 References: <87ilh3z4vo.fsf@contorta> <87edrrz4nd.fsf@contorta> <87a62fz4lj.fsf@contorta> Date: Wed, 18 Jan 2023 20:48:22 -0500 In-Reply-To: <87a62fz4lj.fsf@contorta> (Vagrant Cascadian's message of "Wed, 18 Jan 2023 17:38:00 -0800") Message-ID: <87lelze1ll.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60941 Cc: 60941@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Vagrant Cascadian writes: > From 784d33dad1ff114e4f8043b7b766c785e7fef79f Mon Sep 17 00:00:00 2001 > From: Vagrant Cascadian > Date: Wed, 18 Jan 2023 11:00:46 -0800 > Subject: [PATCH 2/2] gnu: diffoscope: Update to 232. > > * gnu/packages/diffoscope.scm (diffoscope): Update to 232. > [native-inputs]: Add lzip and python-pdf, drop python-pypdf2. > [phases]: Add lzip-external-tool and remove-mono-external-tool. Nitpick: GNU Change Logs style doesn't use a hanging indent in the left margin (see: info '(standards) Style of Change Logs'). > --- > gnu/packages/diffoscope.scm | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) > > diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm > index f730d976fe..59875c2e8e 100644 > --- a/gnu/packages/diffoscope.scm > +++ b/gnu/packages/diffoscope.scm > @@ -75,7 +75,7 @@ (define-module (gnu packages diffoscope) > (define-public diffoscope > (package > (name "diffoscope") > - (version "224") > + (version "232") > (source > (origin > (method git-fetch) > @@ -84,7 +84,7 @@ (define-public diffoscope > (commit version))) > (file-name (git-file-name name version)) > (sha256 > - (base32 "1qdivsf4yygg2az5018pw0q4169zas3hfqjydd0q3bhdrfpl0q4q")) > + (base32 "0zix2m1rlgj7kyx8bkfjb9dnc5idblz6xhmxqq0w3jpnkxxjj8yq")) > (patches > (search-patches "diffoscope-fix-llvm-test.patch")))) > (build-system python-build-system) > @@ -112,6 +112,21 @@ (define-public diffoscope > (string-append "[\"" (which "stat") "\",")) > (("\\[\"getfacl\",") > (string-append "[\"" (which "getfacl") "\","))))) > + (add-after 'unpack 'lzip-external-tool > + ;; Fixed upstream, remove this phase when updating to > + ;; diffoscope 233 nitpick: stand-alone comments should end with a period (complete sentence). > + (lambda _ > + (substitute* "diffoscope/external_tools.py" > + ((".debian.: .lzip.") > + "\"debian\": \"lzip\", \"guix\": \"lzip\"")))) > + (add-after 'unpack 'remove-mono-external-tool > + ;; Fixed upstream, remove this phase when updating to > + ;; diffoscope 233 > + (lambda _ > + (substitute* "diffoscope/external_tools.py" > + ;; "guix": "mono", > + ((".guix.: .mono.,") > + "")))) > (add-after 'build 'build-man-page > (lambda* (#:key (make-flags '()) #:allow-other-keys) There are no #:make-flags argument for the python or pyproject build systems, so that's useless. > (apply invoke "make" "-C" "doc" make-flags))) > @@ -160,7 +175,7 @@ (define-public diffoscope > python-pytest > python-chardet > python-h5py > - python-pypdf2 > + python-pypdf > python-progressbar33 > > abootimg > @@ -195,6 +210,7 @@ (define-public diffoscope > libarchive > llvm-9 > lz4 > + lzip > ocaml > odt2txt > openssh The rest LGTM, thanks for the update! -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 21 22:27:01 2023 Received: (at 60941) by debbugs.gnu.org; 22 Jan 2023 03:27:01 +0000 Received: from localhost ([127.0.0.1]:50210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJR0X-0004TQ-FJ for submit@debbugs.gnu.org; Sat, 21 Jan 2023 22:27:01 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:36886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJR0V-0004T8-Gc for 60941@debbugs.gnu.org; Sat, 21 Jan 2023 22:27:00 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 7800E1AB81; Sat, 21 Jan 2023 19:26:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1674358012; bh=buEADeUrICEA/ajfxe4mQMkmE+I0+t9MhAnDm+CkEEQ=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=2hMeNtkuLVByvwhb9ZRWFK/Zy7hKesPjKzF9n4Ktpi2nyCOKXpqtG6QddExwh67nY QSZr0uggl21fKWw4+QFBextTBfUKSGMr1AlmUHIJVTy/n8UY3J7pe54MkIwlapeVzf DFVyOxyq05TqPywpNY2YShR1oP4t44rBC+iVv43oex0JIbWI/XMnmu9hTIDODefJ+m x2XvhKzgBJFe+HLbgIyoQXwScXRSIzCmKmsXEBxJJIijadse4grZM+00oxVrzinXC0 fUfuEh4SCMJPTkKYYmVy2rCYicu13+wp7SivLmLDxZzfP+kzxOZwbsvwIL4yjIpm6X UbmycGT+tY/iw== From: Vagrant Cascadian To: Maxim Cournoyer Subject: Re: bug#60941: Update diffoscope to 232 In-Reply-To: <87lelze1ll.fsf_-_@gmail.com> References: <87ilh3z4vo.fsf@contorta> <87edrrz4nd.fsf@contorta> <87a62fz4lj.fsf@contorta> <87lelze1ll.fsf_-_@gmail.com> Date: Sat, 21 Jan 2023 19:26:47 -0800 Message-ID: <87fsc36yh4.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60941 Cc: 60941@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain On 2023-01-18, Maxim Cournoyer wrote: > Vagrant Cascadian writes: >> Subject: [PATCH 2/2] gnu: diffoscope: Update to 232. >> >> * gnu/packages/diffoscope.scm (diffoscope): Update to 232. >> [native-inputs]: Add lzip and python-pdf, drop python-pypdf2. >> [phases]: Add lzip-external-tool and remove-mono-external-tool. > > Nitpick: GNU Change Logs style doesn't use a hanging indent in the left > margin (see: info '(standards) Style of Change Logs'). Wow, I think every single one of my commits to date has that issue... hah! >> diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm >> index f730d976fe..59875c2e8e 100644 >> --- a/gnu/packages/diffoscope.scm >> +++ b/gnu/packages/diffoscope.scm ... >> + (add-after 'unpack 'remove-mono-external-tool >> + ;; Fixed upstream, remove this phase when updating to >> + ;; diffoscope 233 >> + (lambda _ >> + (substitute* "diffoscope/external_tools.py" >> + ;; "guix": "mono", >> + ((".guix.: .mono.,") >> + "")))) >> (add-after 'build 'build-man-page >> (lambda* (#:key (make-flags '()) #:allow-other-keys) > > There are no #:make-flags argument for the python or pyproject build > systems, so that's useless. I would welcome a fix for that... I could not figure out how to make it build successfully without it, but that does not say a whole lot. :) live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCY8ys+AAKCRDcUY/If5cW qn/wAQDCmqsRNOVMJs8/Px1FgyBhFcIPs8bmjGBJEBdnH9s5lQD+MTfx7gAdtSAj bCZVi+Ed/UK7wQjLGJyRddUfh0c00gg= =Upr1 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 21 22:31:04 2023 Received: (at 60941) by debbugs.gnu.org; 22 Jan 2023 03:31:04 +0000 Received: from localhost ([127.0.0.1]:50214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJR4S-0004ai-43 for submit@debbugs.gnu.org; Sat, 21 Jan 2023 22:31:04 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:45666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJR4Q-0004aF-CI for 60941@debbugs.gnu.org; Sat, 21 Jan 2023 22:31:03 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 93E001AB81; Sat, 21 Jan 2023 19:30:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1674358256; bh=Z5W3Z78FY9K8IoUhKvmvF5mCSFLCie6bFVQHIfZFIAg=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=HMFpRqRxXlfR3+pnCiA4dgvffJ8PjjN914sUdR4tTx0Q8Io1rJBL35UY+Kdb0VD4W zSuM5j7L609FzJBXaUxd4vV0GOYMr8AJ1iq6vYJDd8dFLWy/WnQEAgzurJWojfMnqW wXROkZheWAB2GGii0u2lQ2fdJtgkWmiKuCDDkpBqA3kgq3sa0cqZe0DBn3mkXu8vr5 G2OEx+lRjdgEd2RwxA1Eh+f9GUPjcT18wD2AU/PcJvl0QJxAGqRupxf4xGyFgs3c+b 29wE/eE/tzV/HffE7iGdsSQ54KJMYFGMJU6jsTpBZDEpGSdEWiKv2AXhEJPe8lxY2d bzuBhPT/c5v+Q== From: Vagrant Cascadian To: 60941@debbugs.gnu.org Subject: [PATCH v2 1/2] gnu: Add python-pypdf. In-Reply-To: <87edrrz4nd.fsf@contorta> References: <87ilh3z4vo.fsf@contorta> <87edrrz4nd.fsf@contorta> Date: Sat, 21 Jan 2023 19:30:50 -0800 Message-ID: <87bkmr6yad.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60941 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain This series switches to pyproject-build-system, git-fetch, and has tests! Some tests are disabled due to network access requirements and non-free assets. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-Add-python-pypdf.patch Content-Transfer-Encoding: quoted-printable From=20a7286537cf92b07798d6b537003675555c5f84ba Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 21 Jan 2023 19:17:23 -0800 Subject: [PATCH 1/2] gnu: Add python-pypdf. * gnu/packages/pdf.scm (python-pypdf): New variable. * gnu/packages/patches/python-pypdf-annotate-tests-appropriately.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. =2D-- gnu/local.mk | 1 + ...n-pypdf-annotate-tests-appropriately.patch | 96 +++++++++++++++++++ gnu/packages/pdf.scm | 29 ++++++ 3 files changed, 126 insertions(+) create mode 100644 gnu/packages/patches/python-pypdf-annotate-tests-approp= riately.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3da47858ff..310c9f1f90 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1639,6 +1639,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/python-louvain-fix-test.patch \ %D%/packages/patches/python-random2-getrandbits-test.patch \ %D%/packages/patches/python-poppler-qt5-fix-build.patch \ + %D%/packages/patches/python-pypdf-annotate-tests-appropriately.patch \ %D%/packages/patches/python-telingo-fix-comparison.patch \ %D%/packages/patches/python-w3lib-fix-test-failure.patch \ %D%/packages/patches/sdcc-disable-non-free-code.patch \ diff --git a/gnu/packages/patches/python-pypdf-annotate-tests-appropriately= .patch b/gnu/packages/patches/python-pypdf-annotate-tests-appropriately.pat= ch new file mode 100644 index 0000000000..14f1f73924 =2D-- /dev/null +++ b/gnu/packages/patches/python-pypdf-annotate-tests-appropriately.patch @@ -0,0 +1,96 @@ +Origin: https://github.com/py-pdf/pypdf/commit/767047b98ee3ea7aca331cfbd63= 502a284bfed93 +From 767047b98ee3ea7aca331cfbd63502a284bfed93 Mon Sep 17 00:00:00 2001 +From: dkg +Date: Sat, 14 Jan 2023 03:32:45 -0500 +Subject: [PATCH 03/14] Annotate tests appropriately (#1551) + +By annotating these tests, we can use pytest markers to skip external +tests and tests that depend on sample-files. +--- + tests/test_reader.py | 5 +++++ + tests/test_writer.py | 4 ++++ + 2 files changed, 9 insertions(+) + +diff --git a/tests/test_reader.py b/tests/test_reader.py +index 710e6c5..62eb7b7 100644 +--- a/tests/test_reader.py ++++ b/tests/test_reader.py +@@ -176,6 +176,7 @@ def test_get_outline(src, outline_elements): + assert len(outline) =3D=3D outline_elements +=20 +=20 ++@pytest.mark.samples + @pytest.mark.parametrize( + ("src", "expected_images"), + [ +@@ -866,6 +867,7 @@ def test_get_fields(): + assert dict(fields["c1-1"]) =3D=3D ({"/FT": "/Btn", "/T": "c1-1"}) +=20 +=20 ++@pytest.mark.external + def test_get_full_qualified_fields(): + url =3D "https://github.com/py-pdf/PyPDF2/files/10142389/fields_with_= dots.pdf" + name =3D "fields_with_dots.pdf" +@@ -1214,6 +1216,7 @@ def test_zeroing_xref(): + len(reader.pages) +=20 +=20 ++@pytest.mark.external + def test_thread(): + url =3D "https://github.com/py-pdf/pypdf/files/9066120/UTA_OSHA_3115_= Fall_Protection_Training_09162021_.pdf" + name =3D "UTA_OSHA.pdf" +@@ -1226,6 +1229,7 @@ def test_thread(): + assert len(reader.threads) >=3D 1 +=20 +=20 ++@pytest.mark.external + def test_build_outline_item(caplog): + url =3D "https://github.com/py-pdf/pypdf/files/9464742/shiv_resume.pd= f" + name =3D "shiv_resume.pdf" +@@ -1253,6 +1257,7 @@ def test_build_outline_item(caplog): + assert "Unexpected destination 2" in exc.value.args[0] +=20 +=20 ++@pytest.mark.samples + @pytest.mark.parametrize( + ("src", "page_labels"), + [ +diff --git a/tests/test_writer.py b/tests/test_writer.py +index 60b4a17..20c4de0 100644 +--- a/tests/test_writer.py ++++ b/tests/test_writer.py +@@ -930,6 +930,7 @@ def test_startup_dest(): + pdf_file_writer.open_destination =3D None +=20 +=20 ++@pytest.mark.external + def test_iss471(): + url =3D "https://github.com/py-pdf/pypdf/files/9139245/book.pdf" + name =3D "book_471.pdf" +@@ -942,6 +943,7 @@ def test_iss471(): + ) +=20 +=20 ++@pytest.mark.external + def test_reset_translation(): + url =3D "https://corpora.tika.apache.org/base/docs/govdocs1/924/92466= 6.pdf" + name =3D "tika-924666.pdf" +@@ -977,6 +979,7 @@ def test_threads_empty(): + assert thr =3D=3D thr2 +=20 +=20 ++@pytest.mark.external + def test_append_without_annots_and_articles(): + url =3D "https://corpora.tika.apache.org/base/docs/govdocs1/924/92466= 6.pdf" + name =3D "tika-924666.pdf" +@@ -993,6 +996,7 @@ def test_append_without_annots_and_articles(): + assert len(writer.threads) >=3D 1 +=20 +=20 ++@pytest.mark.external + def test_append_multiple(): + url =3D "https://corpora.tika.apache.org/base/docs/govdocs1/924/92466= 6.pdf" + name =3D "tika-924666.pdf" +--=20 +2.39.1 + diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 4b9d0623fe..446d833e51 100644 =2D-- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -1260,6 +1260,35 @@ (define-public pdf2svg converter using the Poppler and Cairo libraries.") (license license:gpl2+))) =20 +(define-public python-pypdf + (package + (name "python-pypdf") + (version "3.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/py-pdf/pypdf") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qwvjr694sabfblx22zd54b9ny40f2gbv3bv6q43myrlxwvvisk6")) + (patches (search-patches + "python-pypdf-annotate-tests-appropriately.patch")= ))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest python-flit)) + (propagated-inputs (list python-typing-extensions)) + (home-page "https://github.com/py-pdf/pypdf") + (arguments + (list + ;; Disable tests that use the network and non-free assets. + #:test-flags #~(list "-m" "not external and not samples"))) + (synopsis "Python PDF library") + (description + "This package provides a PDF library capable of splitting, merging, +cropping, and transforming PDF files.") + (license license:bsd-3))) + (define-public python-pypdf2 (package (name "python-pypdf2") =2D-=20 2.39.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCY8yt6gAKCRDcUY/If5cW qkalAP9O9Db1R1LYSLcIpVvgGhcr1Or2CJk90EJgbiVDSIAYKwD7BfcJbGa1cELO 1uBSStzk/HwNemjeTyHRL/IGge1wpg4= =pDTE -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 21 22:32:50 2023 Received: (at 60941) by debbugs.gnu.org; 22 Jan 2023 03:32:50 +0000 Received: from localhost ([127.0.0.1]:50218 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJR69-0004dE-Uw for submit@debbugs.gnu.org; Sat, 21 Jan 2023 22:32:50 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:53336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJR68-0004d1-4H for 60941@debbugs.gnu.org; Sat, 21 Jan 2023 22:32:48 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 6B5F81AB81 for <60941@debbugs.gnu.org>; Sat, 21 Jan 2023 19:32:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1674358361; bh=w+tJ2inN3jk9SKKtvnUYy214md8eeKvEbTRVvfqa/tQ=; h=From:To:Subject:In-Reply-To:References:Date:From; b=hOO/iiA1S2+gsnIg5a8F3ASAdT5WlvzMPwdhOKMNP+Ly1sDpbz9dbUMHX2rFa/R3w WtzH57DW9m7n7ZhhXBkXqeYND2mEfZ/Fp13aaFvf2RWAWPX9iGuvF191ohov+Lqr5a ndxn9JZlItFLclJURzi5jFwVWteDehClsZDpnwPteWMGdhfrV8RGCrD7E0RXhKhNzj iLwamZ2DMbYSDkhCXP/HWbwmXNCUxa10ej/ItTe8uspFmdHNDWszRxYNf4vtGt4IGF hCI+spo3mlIPFRm3ifabgj6FlwtYtGUM6xy4zIiixYZUHfRgjzYS4gaii0rCxBozJT iiPkfoxs0x0sQ== From: Vagrant Cascadian To: 60941@debbugs.gnu.org Subject: [PATCH v2 2/2] gnu: diffoscope: Update to 233. In-Reply-To: <87a62fz4lj.fsf@contorta> References: <87ilh3z4vo.fsf@contorta> <87edrrz4nd.fsf@contorta> <87a62fz4lj.fsf@contorta> Date: Sat, 21 Jan 2023 19:32:37 -0800 Message-ID: <878rhv6y7e.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60941 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain New upstream version which includes some of the changes monkey-patched in from the previous version. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-gnu-diffoscope-Update-to-233.patch Content-Transfer-Encoding: quoted-printable From=207d56d84b140931d434c8b0178797de5b93474173 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 21 Jan 2023 19:17:46 -0800 Subject: [PATCH 2/2] gnu: diffoscope: Update to 233. * gnu/packages/diffoscope.scm (diffoscope): Update to 233. [native-inputs]: Add lzip and python-pdf, drop python-pypdf2. =2D-- gnu/packages/diffoscope.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index f730d976fe..6decb86f02 100644 =2D-- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -75,7 +75,7 @@ (define-module (gnu packages diffoscope) (define-public diffoscope (package (name "diffoscope") =2D (version "224") + (version "233") (source (origin (method git-fetch) @@ -84,7 +84,7 @@ (define-public diffoscope (commit version))) (file-name (git-file-name name version)) (sha256 =2D (base32 "1qdivsf4yygg2az5018pw0q4169zas3hfqjydd0q3bhdrfpl0q4q")) + (base32 "1m6fc7k8cd7ahra05vqccw1fdbjj6d20vr3q8v67ynnyih5nmbnb")) (patches (search-patches "diffoscope-fix-llvm-test.patch")))) (build-system python-build-system) @@ -160,7 +160,7 @@ (define-public diffoscope python-pytest python-chardet python-h5py =2D python-pypdf2 + python-pypdf python-progressbar33 =20 abootimg @@ -195,6 +195,7 @@ (define-public diffoscope libarchive llvm-9 lz4 + lzip ocaml odt2txt openssh =2D-=20 2.39.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCY8yuVQAKCRDcUY/If5cW qoKoAQDuzhXSXTBtXVzEaie9nXM+uVEBoI/mUhx5cbDLdP4acgD9FloBHzIwJnrz QKhvBzW8p+v78scaggntu0YUmUHAaQM= =uY9f -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 22 02:04:11 2023 Received: (at 60941) by debbugs.gnu.org; 22 Jan 2023 07:04:11 +0000 Received: from localhost ([127.0.0.1]:50503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJUOg-0001tp-Cq for submit@debbugs.gnu.org; Sun, 22 Jan 2023 02:04:10 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:54764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJUOd-0001tc-Gy for 60941@debbugs.gnu.org; Sun, 22 Jan 2023 02:04:08 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 2A6BF1AB85; Sat, 21 Jan 2023 23:04:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1674371040; bh=fxXuv779JzSXuxorDLVNrgOo0Uc6QYoTalPp8UazDL4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=eHFna6DVFzmoJqMZTgCoqfVHGCWzB9qjvDuILqTab74PJQS4vI5x/ixXJhRwHsyGQ 5n/K29NdJzA2NpLtTXkZiaAjY4nH6M7SPdwVftalA1QFK5xPZdDYgyuiLySnpQvTKc dHYkXN6eYbR6mc8AqXwJmKSuvdmlZOhSAxI7sVowUbuJat1PDvMRHpfkDoxgCjoOv7 ByYPom3uFWGWxBv7P/B2WBMEYlrkiEPQA7MBHuH4yE7fHLs2QYOyJQpID3j12tjoth qh8bnDggiPjmTD45mFW+qsp81DzJvxfn5xl+pCpZtW1Hee4cPUM1EArxX89M12oUfq 53600BmS8XJyw== From: Vagrant Cascadian To: 60941@debbugs.gnu.org Subject: Re: [PATCH v3 1/2] gnu: Add python-pypdf. In-Reply-To: <87bkmr6yad.fsf@contorta> References: <87ilh3z4vo.fsf@contorta> <87edrrz4nd.fsf@contorta> <87bkmr6yad.fsf@contorta> Date: Sat, 21 Jan 2023 23:03:39 -0800 Message-ID: <87ilgzuk38.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60941 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain No change. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-Add-python-pypdf.patch Content-Transfer-Encoding: quoted-printable From=20421c017a26ffa77120a2e8792779296a141ecbb5 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 21 Jan 2023 19:17:23 -0800 Subject: [PATCH 1/2] gnu: Add python-pypdf. * gnu/packages/pdf.scm (python-pypdf): New variable. * gnu/packages/patches/python-pypdf-annotate-tests-appropriately.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. =2D-- gnu/local.mk | 1 + ...n-pypdf-annotate-tests-appropriately.patch | 96 +++++++++++++++++++ gnu/packages/pdf.scm | 29 ++++++ 3 files changed, 126 insertions(+) create mode 100644 gnu/packages/patches/python-pypdf-annotate-tests-approp= riately.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3da47858ff..310c9f1f90 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1639,6 +1639,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/python-louvain-fix-test.patch \ %D%/packages/patches/python-random2-getrandbits-test.patch \ %D%/packages/patches/python-poppler-qt5-fix-build.patch \ + %D%/packages/patches/python-pypdf-annotate-tests-appropriately.patch \ %D%/packages/patches/python-telingo-fix-comparison.patch \ %D%/packages/patches/python-w3lib-fix-test-failure.patch \ %D%/packages/patches/sdcc-disable-non-free-code.patch \ diff --git a/gnu/packages/patches/python-pypdf-annotate-tests-appropriately= .patch b/gnu/packages/patches/python-pypdf-annotate-tests-appropriately.pat= ch new file mode 100644 index 0000000000..14f1f73924 =2D-- /dev/null +++ b/gnu/packages/patches/python-pypdf-annotate-tests-appropriately.patch @@ -0,0 +1,96 @@ +Origin: https://github.com/py-pdf/pypdf/commit/767047b98ee3ea7aca331cfbd63= 502a284bfed93 +From 767047b98ee3ea7aca331cfbd63502a284bfed93 Mon Sep 17 00:00:00 2001 +From: dkg +Date: Sat, 14 Jan 2023 03:32:45 -0500 +Subject: [PATCH 03/14] Annotate tests appropriately (#1551) + +By annotating these tests, we can use pytest markers to skip external +tests and tests that depend on sample-files. +--- + tests/test_reader.py | 5 +++++ + tests/test_writer.py | 4 ++++ + 2 files changed, 9 insertions(+) + +diff --git a/tests/test_reader.py b/tests/test_reader.py +index 710e6c5..62eb7b7 100644 +--- a/tests/test_reader.py ++++ b/tests/test_reader.py +@@ -176,6 +176,7 @@ def test_get_outline(src, outline_elements): + assert len(outline) =3D=3D outline_elements +=20 +=20 ++@pytest.mark.samples + @pytest.mark.parametrize( + ("src", "expected_images"), + [ +@@ -866,6 +867,7 @@ def test_get_fields(): + assert dict(fields["c1-1"]) =3D=3D ({"/FT": "/Btn", "/T": "c1-1"}) +=20 +=20 ++@pytest.mark.external + def test_get_full_qualified_fields(): + url =3D "https://github.com/py-pdf/PyPDF2/files/10142389/fields_with_= dots.pdf" + name =3D "fields_with_dots.pdf" +@@ -1214,6 +1216,7 @@ def test_zeroing_xref(): + len(reader.pages) +=20 +=20 ++@pytest.mark.external + def test_thread(): + url =3D "https://github.com/py-pdf/pypdf/files/9066120/UTA_OSHA_3115_= Fall_Protection_Training_09162021_.pdf" + name =3D "UTA_OSHA.pdf" +@@ -1226,6 +1229,7 @@ def test_thread(): + assert len(reader.threads) >=3D 1 +=20 +=20 ++@pytest.mark.external + def test_build_outline_item(caplog): + url =3D "https://github.com/py-pdf/pypdf/files/9464742/shiv_resume.pd= f" + name =3D "shiv_resume.pdf" +@@ -1253,6 +1257,7 @@ def test_build_outline_item(caplog): + assert "Unexpected destination 2" in exc.value.args[0] +=20 +=20 ++@pytest.mark.samples + @pytest.mark.parametrize( + ("src", "page_labels"), + [ +diff --git a/tests/test_writer.py b/tests/test_writer.py +index 60b4a17..20c4de0 100644 +--- a/tests/test_writer.py ++++ b/tests/test_writer.py +@@ -930,6 +930,7 @@ def test_startup_dest(): + pdf_file_writer.open_destination =3D None +=20 +=20 ++@pytest.mark.external + def test_iss471(): + url =3D "https://github.com/py-pdf/pypdf/files/9139245/book.pdf" + name =3D "book_471.pdf" +@@ -942,6 +943,7 @@ def test_iss471(): + ) +=20 +=20 ++@pytest.mark.external + def test_reset_translation(): + url =3D "https://corpora.tika.apache.org/base/docs/govdocs1/924/92466= 6.pdf" + name =3D "tika-924666.pdf" +@@ -977,6 +979,7 @@ def test_threads_empty(): + assert thr =3D=3D thr2 +=20 +=20 ++@pytest.mark.external + def test_append_without_annots_and_articles(): + url =3D "https://corpora.tika.apache.org/base/docs/govdocs1/924/92466= 6.pdf" + name =3D "tika-924666.pdf" +@@ -993,6 +996,7 @@ def test_append_without_annots_and_articles(): + assert len(writer.threads) >=3D 1 +=20 +=20 ++@pytest.mark.external + def test_append_multiple(): + url =3D "https://corpora.tika.apache.org/base/docs/govdocs1/924/92466= 6.pdf" + name =3D "tika-924666.pdf" +--=20 +2.39.1 + diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 4b9d0623fe..446d833e51 100644 =2D-- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -1260,6 +1260,35 @@ (define-public pdf2svg converter using the Poppler and Cairo libraries.") (license license:gpl2+))) =20 +(define-public python-pypdf + (package + (name "python-pypdf") + (version "3.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/py-pdf/pypdf") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qwvjr694sabfblx22zd54b9ny40f2gbv3bv6q43myrlxwvvisk6")) + (patches (search-patches + "python-pypdf-annotate-tests-appropriately.patch")= ))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest python-flit)) + (propagated-inputs (list python-typing-extensions)) + (home-page "https://github.com/py-pdf/pypdf") + (arguments + (list + ;; Disable tests that use the network and non-free assets. + #:test-flags #~(list "-m" "not external and not samples"))) + (synopsis "Python PDF library") + (description + "This package provides a PDF library capable of splitting, merging, +cropping, and transforming PDF files.") + (license license:bsd-3))) + (define-public python-pypdf2 (package (name "python-pypdf2") =2D-=20 2.39.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCY8zfzAAKCRDcUY/If5cW quOtAP48C8oh/a7gOUVQH+5r/M+AhdthE+/knTKzd3a8ukd5XgEA0Vk3qrD1J7WX P+awPkgfldAw9Zq8ApNxImDmCv1yBwg= =maXQ -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 22 02:06:32 2023 Received: (at 60941) by debbugs.gnu.org; 22 Jan 2023 07:06:32 +0000 Received: from localhost ([127.0.0.1]:50507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJUQy-0001xI-8A for submit@debbugs.gnu.org; Sun, 22 Jan 2023 02:06:32 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:45330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJUQx-0001x6-2I for 60941@debbugs.gnu.org; Sun, 22 Jan 2023 02:06:31 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 5C6291AB85; Sat, 21 Jan 2023 23:06:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1674371185; bh=M9i9uMPKhvB98XQfzMwxCIYHaKOnvos24UoeEOuO84E=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=tTxld690GfqZJKHXFGC0krJul7nqZom5hbLVPYOi7GpRrexxVZ11SJ7JHGLZSAbWf ZUbWMW3ps1f/plYnMJT2esaMDZh6QnyE4N5W9D6UlxZbFShBQjChBR5lAGutDO5DcT /PcK28iDrPH6aA+lXtNsR5Vin/DuG+lGJgU/dacrKH3VSQXs32KoGRvFtlchUckYpu tKHneTV/p1bMjauSJFRMwcfcBjA0W8gEn+S6lZN6blyx+KUyjfQsKryPInLKmeLBYF oiReLZQUgwfGrGj5Azm7WJiwGuVfko964BoIGxXUJ2CDDQORR2hblcTny6Gh+u1L4R dz0L9rusRXMdw== From: Vagrant Cascadian To: 60941@debbugs.gnu.org Subject: Re: [PATCH v3 2/2] gnu: diffoscope: Update to 233. In-Reply-To: <87ilgzuk38.fsf@contorta> References: <87ilh3z4vo.fsf@contorta> <87edrrz4nd.fsf@contorta> <87bkmr6yad.fsf@contorta> <87ilgzuk38.fsf@contorta> Date: Sat, 21 Jan 2023 23:06:21 -0800 Message-ID: <87edrnujyq.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60941 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Fix typo in commit message (python-pdf -> python-pypdf). Hopefully patchwork will correctly identify the python-pypdf patch as a dependency this time... --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-gnu-diffoscope-Update-to-233.patch Content-Transfer-Encoding: quoted-printable From=20420781d76b8323df36e27dea0cd7561d150f874b Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 21 Jan 2023 19:17:46 -0800 Subject: [PATCH 2/2] gnu: diffoscope: Update to 233. * gnu/packages/diffoscope.scm (diffoscope): Update to 233. [native-inputs]: Add lzip and python-pypdf, drop python-pypdf2. =2D-- gnu/packages/diffoscope.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index f730d976fe..6decb86f02 100644 =2D-- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -75,7 +75,7 @@ (define-module (gnu packages diffoscope) (define-public diffoscope (package (name "diffoscope") =2D (version "224") + (version "233") (source (origin (method git-fetch) @@ -84,7 +84,7 @@ (define-public diffoscope (commit version))) (file-name (git-file-name name version)) (sha256 =2D (base32 "1qdivsf4yygg2az5018pw0q4169zas3hfqjydd0q3bhdrfpl0q4q")) + (base32 "1m6fc7k8cd7ahra05vqccw1fdbjj6d20vr3q8v67ynnyih5nmbnb")) (patches (search-patches "diffoscope-fix-llvm-test.patch")))) (build-system python-build-system) @@ -160,7 +160,7 @@ (define-public diffoscope python-pytest python-chardet python-h5py =2D python-pypdf2 + python-pypdf python-progressbar33 =20 abootimg @@ -195,6 +195,7 @@ (define-public diffoscope libarchive llvm-9 lz4 + lzip ocaml odt2txt openssh =2D-=20 2.39.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCY8zgbQAKCRDcUY/If5cW qpXkAP4s9zl7GVu+9sx9/Ltz9uVXVvr/xIdVMezwFwF/OvbpkgD+IvxUyZ7abp8H 4lgjCyg+S75i01JNv1LSYheNcIwtSAM= =KAvv -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 22 20:04:54 2023 Received: (at 60941) by debbugs.gnu.org; 23 Jan 2023 01:04:54 +0000 Received: from localhost ([127.0.0.1]:52870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJlGY-0007KQ-9C for submit@debbugs.gnu.org; Sun, 22 Jan 2023 20:04:54 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:39919) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJlGW-0007KD-VZ for 60941@debbugs.gnu.org; Sun, 22 Jan 2023 20:04:53 -0500 Received: by mail-qt1-f178.google.com with SMTP id s4so8643393qtx.6 for <60941@debbugs.gnu.org>; Sun, 22 Jan 2023 17:04:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=xfOnZxH7FY21KvJU/Hx33Wkkiws7MW/CeUzPrLDujBQ=; b=VnYjSfPqeCqZhgSviXgxE7GcjEg4O7K4zDMi8y0uNgpyDhyMuA6N/Tnfauu6Y8cQWQ ZtWVqVHgxOkrwKxBzzpo12VrLKoHxLHUCh6iRFpAh4WYXYwWx1LeVPnPgVMBipQQUnqt nuwpHXPc0jx1mV9G7OXRcD9oS3j1VHGx2z+BYDV+XCAKyRRuTcbNKoetWQMeJw+TlPgr rIhYQeDamTRAf+l0iuGgdhOICg6Qmo4C9PnilXcyVIs/jtoiaR7iG2RSRfDHNpHtDkYo +2fL6csoYOzZHYTAvNqpikMEAhFSAJO3XKFht09prd2lTWC3XBiey8kFzgsKuieLQcpk MPKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=xfOnZxH7FY21KvJU/Hx33Wkkiws7MW/CeUzPrLDujBQ=; b=pMJnannQihWvYO8oMdrjPc8xE8afCuPIyigTJwXYKUwJ6+oVYoJ8bW8/8q6LCC/Nk8 2JA2YWO/HkQNJcsQy35p0RHxzg/arr3koyjq0a0RB8LhuZsor4tB2u0B6kBQSNJDQsuZ 8huwy9ZekEB4VyuBcolzji8vlro8vsd1vmHrhufbCAGlDFDeZSJfBrRXiHqXdNGiddYN V13lZMNpcORrLop4dQIUB4XhgFiVIgujBxIKLQ3eek9qCR+AGWUbWAuUXYpNXHiZC9Bf NR3OfGbVivPZ3DTfdqt+JOuSgHmfUnSGCGEgbHaV9KZ35aW6kAbxJVmkrf2a0bPbPoQf y17A== X-Gm-Message-State: AFqh2kqAKY0qgs/+lvKgiobacFk73THUI20KPCx4lYtLAz375GDI8Gaj Fsy+ih/DXjOLxVTEZaydSCOqm6mJPADhdQ== X-Google-Smtp-Source: AMrXdXuoWzvzIAcfxKResSAJLTlGlr+B5nkr3qf/SsbdPXZG0JEQCHjmaDLNX6hvkXbyOc6Di2sjZw== X-Received: by 2002:a05:622a:508a:b0:3ac:77ed:3995 with SMTP id fp10-20020a05622a508a00b003ac77ed3995mr29279056qtb.26.1674435887143; Sun, 22 Jan 2023 17:04:47 -0800 (PST) Received: from hurd ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id b1-20020ac844c1000000b003b34650039bsm14109603qto.76.2023.01.22.17.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Jan 2023 17:04:46 -0800 (PST) From: Maxim Cournoyer To: Vagrant Cascadian Subject: Re: bug#60941: Update diffoscope to 232 References: <87ilh3z4vo.fsf@contorta> <87edrrz4nd.fsf@contorta> <87a62fz4lj.fsf@contorta> <87lelze1ll.fsf_-_@gmail.com> <87fsc36yh4.fsf@contorta> Date: Sun, 22 Jan 2023 20:04:45 -0500 In-Reply-To: <87fsc36yh4.fsf@contorta> (Vagrant Cascadian's message of "Sat, 21 Jan 2023 19:26:47 -0800") Message-ID: <87wn5eysb6.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60941 Cc: 60941@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Vagrant Cascadian writes: [...] >>> diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm >>> index f730d976fe..59875c2e8e 100644 >>> --- a/gnu/packages/diffoscope.scm >>> +++ b/gnu/packages/diffoscope.scm > ... >>> + (add-after 'unpack 'remove-mono-external-tool >>> + ;; Fixed upstream, remove this phase when updating to >>> + ;; diffoscope 233 >>> + (lambda _ >>> + (substitute* "diffoscope/external_tools.py" >>> + ;; "guix": "mono", >>> + ((".guix.: .mono.,") >>> + "")))) >>> (add-after 'build 'build-man-page >>> (lambda* (#:key (make-flags '()) #:allow-other-keys) >> >> There are no #:make-flags argument for the python or pyproject build >> systems, so that's useless. > > I would welcome a fix for that... I could not figure out how to make it > build successfully without it, but that does not say a whole lot. :) I addressed it in a subsequent commit ("gnu: diffoscope: Simplify the build-man-page phase."). -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 22 20:07:12 2023 Received: (at 60941-done) by debbugs.gnu.org; 23 Jan 2023 01:07:12 +0000 Received: from localhost ([127.0.0.1]:52878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJlIl-0007OW-Pa for submit@debbugs.gnu.org; Sun, 22 Jan 2023 20:07:12 -0500 Received: from mail-qt1-f177.google.com ([209.85.160.177]:43797) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJlIj-0007OJ-IC for 60941-done@debbugs.gnu.org; Sun, 22 Jan 2023 20:07:09 -0500 Received: by mail-qt1-f177.google.com with SMTP id a25so8629976qto.10 for <60941-done@debbugs.gnu.org>; Sun, 22 Jan 2023 17:07:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=zSq5DFjpOBWmSgrwpGHKswPEqrjTJAr5m3uMHhBKZyU=; b=hrYDmcMqqrsbUB5i+lIdukfGhREYxaZIHhI6UYCY8PHfBU+a1/0/WR1SgoQpul7C8z /85IrMe/g9JTmIeDbAI/vDJD2cFUqcDYuhVvvD5dZOQhh7Rdwfeel0ZBhJFn7PcFHpGB WubHiMNyqgZdsxN+tWmmjfaZgJh+Ss1niDNmbrPCb2MUXjbV+m0YSa+X673LvUptEel3 7dQ5lWQTLz5xOlzET+uJnkZJpPdJ+7urup3RT2vpWlKBXydxNzAnbVWQxnaE+9cVhpVm c0JWABg24kefRhijurVCR96OwdHF6CyDHf92LYicZ//Tznu/7fmEXKwpzvF8a+eK/9Oh 0LcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=zSq5DFjpOBWmSgrwpGHKswPEqrjTJAr5m3uMHhBKZyU=; b=53S0r33mib1WIjvYILTBdZ9DbZMc3cC3vO0WRAMoXDbJO2buWtw2/60pb6zc5sNABw twed05yNcr/0LkLjES3PGHyRY5uEIpGidOODAn+Rol2G5Y9AZfgaHeEx6WsnG08XFsmr QCyR8NUFgSSTZhppUatSpKt2kc0Co6UOqDDI4zCWb7WVTC+olXGyHYhlU6t7PUOrZqCd wFuwM4+Qq1lc8xq6k5qiDpMHhTlGIVJKGdlWmgsdBg3fWDN2dvPtEGiCkO/nXNVlHUo7 w4cQgeky5FNKAuc5OvAdxN+shvzp6xP84lyJxiO0vnmYr2Na16pRWAg32n1IOgRghmxq Z+rA== X-Gm-Message-State: AFqh2krJyIKO3IwnyqfLkrKGmdf5AKvyt+8G40dMrz98DMFqdZmZe46L jf9p4f33i8uz2zkgxDZPLTJeIFX019hr/g== X-Google-Smtp-Source: AMrXdXtHI8yAveSIvsb3sjAzMoxsYgBZnuoNeF/j5fwP+FvKqYPrsJBsE6lU5sAtVcBe05SxUcNmSg== X-Received: by 2002:ac8:774d:0:b0:3b0:ca89:c467 with SMTP id g13-20020ac8774d000000b003b0ca89c467mr35083379qtu.51.1674436023979; Sun, 22 Jan 2023 17:07:03 -0800 (PST) Received: from hurd ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id v23-20020ae9e317000000b006fbbdc6c68fsm6151801qkf.68.2023.01.22.17.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Jan 2023 17:07:03 -0800 (PST) From: Maxim Cournoyer To: Vagrant Cascadian Subject: Re: [PATCH v3 2/2] gnu: diffoscope: Update to 233. References: <87ilh3z4vo.fsf@contorta> <87edrrz4nd.fsf@contorta> <87bkmr6yad.fsf@contorta> <87ilgzuk38.fsf@contorta> <87edrnujyq.fsf@contorta> Date: Sun, 22 Jan 2023 20:07:02 -0500 In-Reply-To: <87edrnujyq.fsf@contorta> (Vagrant Cascadian's message of "Sat, 21 Jan 2023 23:06:21 -0800") Message-ID: <87pmb6ys7d.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 60941-done Cc: 60941-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Vagrant Cascadian writes: > Fix typo in commit message (python-pdf -> python-pypdf). > > Hopefully patchwork will correctly identify the python-pypdf patch as a > dependency this time... > > From 420781d76b8323df36e27dea0cd7561d150f874b Mon Sep 17 00:00:00 2001 > From: Vagrant Cascadian > Date: Sat, 21 Jan 2023 19:17:46 -0800 > Subject: [PATCH 2/2] gnu: diffoscope: Update to 233. > > * gnu/packages/diffoscope.scm (diffoscope): Update to 233. > [native-inputs]: Add lzip and python-pypdf, drop python-pypdf2. Applied, along with python-pypdf. -- Thanks, Maxim From unknown Fri Jun 20 18:16:59 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 20 Feb 2023 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator