From unknown Sat Aug 16 11:41:09 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26025: [PATCH] gnu: python-matplotlib-documentation: Fix build. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Mar 2017 12:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 26025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26025@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.148897762625957 (code B ref -1); Wed, 08 Mar 2017 12:54:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 Mar 2017 12:53:46 +0000 Received: from localhost ([127.0.0.1]:45481 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clb66-0006kW-Lw for submit@debbugs.gnu.org; Wed, 08 Mar 2017 07:53:46 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49957) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clb64-0006kH-LO for submit@debbugs.gnu.org; Wed, 08 Mar 2017 07:53:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clb5y-000445-5U for submit@debbugs.gnu.org; Wed, 08 Mar 2017 07:53:35 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35441) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1clb5y-000441-22 for submit@debbugs.gnu.org; Wed, 08 Mar 2017 07:53:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clb5w-00053U-Js for guix-patches@gnu.org; Wed, 08 Mar 2017 07:53:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clb5t-00043k-Gh for guix-patches@gnu.org; Wed, 08 Mar 2017 07:53:32 -0500 Received: from s02-out.spamexperts.axc.nl ([185.175.200.125]:52749) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1clb5s-00043O-Ps for guix-patches@gnu.org; Wed, 08 Mar 2017 07:53:29 -0500 Received: from vserver42.axc.nl ([185.182.56.92]) by s02.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1clb5p-0007Bz-Ta for guix-patches@gnu.org; Wed, 08 Mar 2017 13:53:26 +0100 Received: from mail.axc.nl ([159.253.0.157]:36927) by vserver42.axc.nl with esmtp (Exim 4.88) (envelope-from ) id 1clb5d-0003Xn-7b for guix-patches@gnu.org; Wed, 08 Mar 2017 13:53:23 +0100 Date: Wed, 08 Mar 2017 13:53:08 +0100 (CET) Message-Id: <20170308.135308.2045417487512901788.post@thomasdanckaert.be> From: Thomas Danckaert X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Wed_Mar__8_13_53_08_2017_063)--" Content-Transfer-Encoding: 7bit PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 159.253.0.157 SpamTally: Final spam score: 0 X-Originating-IP: 185.182.56.92 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 185.182.56.92 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=185.182.56.92@vserver42.axc.nl X-SpamExperts-Outgoing-Class: ham X-SpamExperts-Outgoing-Evidence: Combined (0.20) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXqqJaA2HH/Aii1j+aNknXwgRcOb18WfxGyg6Om6u4YYmwoNKRQa9Zvl0tXD WAoLpVMvPRYKza70yK2TxRJHcdD+oEAP/to+02F3J4r01qcN199fxN2oReTDHAyOynaY0Cldue3r +qEeQYBWND7fDPGoUqYOv6lKxxeboK+YPP3g5J9Wyy39ARVu6lpph/EphEmSUaqSECP9/MJNMfS9 WPFvtKiR9oEdyOK7GnLP3Jw7nAFKpw6uarMIchUUKBPMSwpsA+InX/wdaCJvrb8pei+p4b5M4KNx 9itLvqUKsRx38obxR0PuC4wwYQTc8Sg/23VtqGjgyi5JHolhrWpNa9YQsl4SUWp4U8fCCSBjefGq te4ROxlmGgdR7QBaGWEQFYs+dvusjRV96oP1cmFb05OHyZAZLfpWinSu+danhtKvH9pAsaSpuQPS cbIWdeXhkZC4rAXOgWX2FBHgH187+EKv5hICVo92zvI9isesxBu4AK5YVcPPq3MXlUe9sP5+k0dp Y7f6EqR6zsgzOR3cDnOA+4wJBS5p5UQFgoGIhoY+WI6m7plLfIjU5rKAaShIuBM6qQzLuCe/hQ3A 5i3Uw+OAbBH+DkNPnrywBHhKB8rPDBfx1bbfhyaO3VHMr4+RLj+xxb0AeOVQkpm2hvu5J0yjCyqf CSEgsxbFAyq6yW1bRKyj2K/uRn1rMm3cNj8TueY= X-Report-Abuse-To: spam@s01.spamexperts.axc.nl X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) 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: -4.0 (----) ----Next_Part(Wed_Mar__8_13_53_08_2017_063)-- Content-Type: Text/Plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Hi Guix, I didn't notice that building html documentation for the updated matplotlib package failed halfway. This patch fixes that, and rewrites the build procedure in a way that should make the package build fail on similar errors in the future. Thomas ----Next_Part(Wed_Mar__8_13_53_08_2017_063)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0001-gnu-python-matplotlib-documentation-Fix-build.patch" >From c16cfc0ecaa41c5e974dc9ce480eed5c16759a9a Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Tue, 7 Mar 2017 20:42:05 +0100 Subject: [PATCH] gnu: python-matplotlib-documentation: Fix build. * gnu/packages/python.scm (python-matplotlib-documentation) [native-inputs]: Add python-mock and graphviz. [arguments]: Use separate build and install phases; correctly set latex paper size. --- gnu/packages/python.scm | 61 +++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a271ad46b..0b7804e0a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3968,6 +3968,8 @@ toolkits.") ("python-sphinx" ,python-sphinx) ("python-numpydoc" ,python-numpydoc) ("python-ipython" ,python-ipython) + ("python-mock" ,python-mock) + ("graphviz" ,graphviz) ("texlive" ,texlive) ("texinfo" ,texinfo) ,@(package-native-inputs python-matplotlib))) @@ -3975,42 +3977,41 @@ toolkits.") `(#:tests? #f ; we're only generating documentation #:phases (modify-phases %standard-phases - (delete 'build) + (replace 'build + (lambda _ + (chdir "doc") + ;; Produce pdf in 'A4' format. + (substitute* "conf.py" + (("latex_paper_size = 'letter'") "") + ;; latex_paper_size is deprecated -> set paper size using + ;; latex_elements + (("latex_elements\\['pointsize'\\] = '11pt'" match) + ;; insert at a point where latex_elements{} is defined: + (string-append match "\nlatex_elements['papersize'] = 'a4paper'"))) + (zero? (system* "python" "make.py" "html" "latex" "texinfo")))) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((data (string-append (assoc-ref outputs "out") "/share")) - (doc (string-append data "/doc/" ,name "-" ,version)) + (doc (string-append data "/doc/python-matplotlib-" ,version)) (info (string-append data "/info")) (html (string-append doc "/html"))) - ;; Make installed package available for building the - ;; documentation - (with-directory-excursion "doc" - ;; Produce pdf in 'A4' format. - (substitute* (find-files "." "conf\\.py") - (("latex_paper_size = 'letter'") - "latex_paper_size = 'a4'")) - (mkdir-p html) - (mkdir-p info) - ;; The doc recommends to run the 'html' target twice. - (system* "python" "make.py" "html") - (system* "python" "make.py" "html") - (copy-recursively "build/html" html) - (system* "python" "make.py" "latex") - (system* "python" "make.py" "texinfo") + (mkdir-p html) + (mkdir-p info) + (copy-recursively "build/html" html) + (symlink (string-append html "/_images") + (string-append info "/matplotlib-figures")) + (with-directory-excursion "build/texinfo" + (substitute* "matplotlib.texi" + (("@image\\{([^,]*)" all file) + (string-append "@image{matplotlib-figures/" file))) (symlink (string-append html "/_images") - (string-append info "/matplotlib-figures")) - (with-directory-excursion "build/texinfo" - (substitute* "matplotlib.texi" - (("@image\\{([^,]*)" all file) - (string-append "@image{matplotlib-figures/" file))) - (symlink (string-append html "/_images") - "./matplotlib-figures") - (system* "makeinfo" "--no-split" - "-o" "matplotlib.info" "matplotlib.texi")) - (copy-file "build/texinfo/matplotlib.info" - (string-append info "/matplotlib.info")) - (copy-file "build/latex/Matplotlib.pdf" - (string-append doc "/Matplotlib.pdf")))) + "./matplotlib-figures") + (system* "makeinfo" "--no-split" + "-o" "matplotlib.info" "matplotlib.texi")) + (copy-file "build/texinfo/matplotlib.info" + (string-append info "/matplotlib.info")) + (copy-file "build/latex/Matplotlib.pdf" + (string-append doc "/Matplotlib.pdf"))) #t))))) (home-page (package-home-page python-matplotlib)) (synopsis "Documentation for the python-matplotlib package") -- 2.11.1 ----Next_Part(Wed_Mar__8_13_53_08_2017_063)---- From unknown Sat Aug 16 11:41:09 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Thomas Danckaert Subject: bug#26025: closed (Re: bug#26025: [PATCH] gnu: python-matplotlib-documentation: Fix build.) Message-ID: References: <87o9xb3cbb.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170308.135308.2045417487512901788.post@thomasdanckaert.be> X-Gnu-PR-Message: they-closed 26025 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 26025@debbugs.gnu.org Date: Wed, 08 Mar 2017 17:32:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1488994322-26538-1" This is a multi-part message in MIME format... ------------=_1488994322-26538-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #26025: [PATCH] gnu: python-matplotlib-documentation: Fix build. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 26025@debbugs.gnu.org. --=20 26025: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26025 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1488994322-26538-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 26025-done) by debbugs.gnu.org; 8 Mar 2017 17:31:26 +0000 Received: from localhost ([127.0.0.1]:46559 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clfQs-0006tI-LH for submit@debbugs.gnu.org; Wed, 08 Mar 2017 12:31:26 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:51954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clfQr-0006t8-G4 for 26025-done@debbugs.gnu.org; Wed, 08 Mar 2017 12:31:26 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 3C83920F98; Wed, 8 Mar 2017 12:31:23 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Wed, 08 Mar 2017 12:31:23 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=IdtQ9jVnP9yLFTvOd0afPh+rQkU=; b=K0usfe B0McG8hXuD3HRNr9SvDcXFGkF0/RvQRzz+ETf/P/0k4LQ7BOeYxn97DUIiXzCuyo p4MIgpZf4u87843ysaMgQ4BHLILbyTnE6BmJyCzJqrkONx4inESdHSS9sZeSeht2 aqyv9PkmxmB+OMfVXLbfP8xoQOUgjB40PCgw8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=smtpout; bh=IdtQ9jVnP9yLFT vOd0afPh+rQkU=; b=effQQZH3cR2JdCoVBu/Oz3brOmBCPaBNQuIXBYWvuIBoey z+Hxw/KRRwbBkBMLgiVhARn8OaVT5oK4hGPHoaszCBKcHD/yvEjS7p+aJuhE3sPp z2bHfVMWgezilNjdPB1oqCcrpeparg0FDY21gbSzyydSaZayHZCV+rEnGXS1g= X-ME-Sender: X-Sasl-enc: MkePwNdkg2J5OtunTwBOUBAismFtj4c8HwczalTXINOG 1488994282 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id C5B137E41F; Wed, 8 Mar 2017 12:31:22 -0500 (EST) From: Marius Bakke To: Thomas Danckaert , 26025-done@debbugs.gnu.org Subject: Re: bug#26025: [PATCH] gnu: python-matplotlib-documentation: Fix build. In-Reply-To: <20170308.135308.2045417487512901788.post@thomasdanckaert.be> References: <20170308.135308.2045417487512901788.post@thomasdanckaert.be> User-Agent: Notmuch/0.23.7 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Wed, 08 Mar 2017 18:31:20 +0100 Message-ID: <87o9xb3cbb.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26025-done 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: -0.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Thomas Danckaert writes: > Hi Guix, > > I didn't notice that building html documentation for the updated=20 > matplotlib package failed halfway. This patch fixes that, and=20 > rewrites the build procedure in a way that should make the package=20 > build fail on similar errors in the future. Pushed, thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAljAP+kACgkQoqBt8qM6 VPpfFAgAmDjxRZos3c2R3rJWUnb+AZzTJ6CVbL6U2JMXRxtUxStD3DJX90TjZFue +y3TBhcxMjSgDJK33aqxBfQNvtbJnjZEo/BIdXWePBNT0yVxc7aIUfz1eJyvyGkP ZGCGSq6f0p1a8rOy6FwWbcoT4FM4Kct3wGjoT0Z/JtSRb2I+/eRnzZ+m6wClNdb8 xXskrQttucqJp3TWcFQ9KLyO6zJZKFFOn8lxhJlgkrNQSKkiWrfJuJ72TqvsflAf JD0Bq94OxDYMF2P5sp2Kz5vGhoEmZGPJ5GgwwDew9RRVniXaioQSeXVFT43kYLiF gn7rIm2A/L7WMTuyIIV2/PuhxWrw/Q== =9inq -----END PGP SIGNATURE----- --=-=-=-- ------------=_1488994322-26538-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 8 Mar 2017 12:53:46 +0000 Received: from localhost ([127.0.0.1]:45481 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clb66-0006kW-Lw for submit@debbugs.gnu.org; Wed, 08 Mar 2017 07:53:46 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49957) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clb64-0006kH-LO for submit@debbugs.gnu.org; Wed, 08 Mar 2017 07:53:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clb5y-000445-5U for submit@debbugs.gnu.org; Wed, 08 Mar 2017 07:53:35 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35441) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1clb5y-000441-22 for submit@debbugs.gnu.org; Wed, 08 Mar 2017 07:53:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clb5w-00053U-Js for guix-patches@gnu.org; Wed, 08 Mar 2017 07:53:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clb5t-00043k-Gh for guix-patches@gnu.org; Wed, 08 Mar 2017 07:53:32 -0500 Received: from s02-out.spamexperts.axc.nl ([185.175.200.125]:52749) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1clb5s-00043O-Ps for guix-patches@gnu.org; Wed, 08 Mar 2017 07:53:29 -0500 Received: from vserver42.axc.nl ([185.182.56.92]) by s02.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1clb5p-0007Bz-Ta for guix-patches@gnu.org; Wed, 08 Mar 2017 13:53:26 +0100 Received: from mail.axc.nl ([159.253.0.157]:36927) by vserver42.axc.nl with esmtp (Exim 4.88) (envelope-from ) id 1clb5d-0003Xn-7b for guix-patches@gnu.org; Wed, 08 Mar 2017 13:53:23 +0100 Date: Wed, 08 Mar 2017 13:53:08 +0100 (CET) Message-Id: <20170308.135308.2045417487512901788.post@thomasdanckaert.be> To: guix-patches@gnu.org Subject: [PATCH] gnu: python-matplotlib-documentation: Fix build. From: Thomas Danckaert X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Wed_Mar__8_13_53_08_2017_063)--" Content-Transfer-Encoding: 7bit PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 159.253.0.157 SpamTally: Final spam score: 0 X-Originating-IP: 185.182.56.92 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 185.182.56.92 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=185.182.56.92@vserver42.axc.nl X-SpamExperts-Outgoing-Class: ham X-SpamExperts-Outgoing-Evidence: Combined (0.20) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXqqJaA2HH/Aii1j+aNknXwgRcOb18WfxGyg6Om6u4YYmwoNKRQa9Zvl0tXD WAoLpVMvPRYKza70yK2TxRJHcdD+oEAP/to+02F3J4r01qcN199fxN2oReTDHAyOynaY0Cldue3r +qEeQYBWND7fDPGoUqYOv6lKxxeboK+YPP3g5J9Wyy39ARVu6lpph/EphEmSUaqSECP9/MJNMfS9 WPFvtKiR9oEdyOK7GnLP3Jw7nAFKpw6uarMIchUUKBPMSwpsA+InX/wdaCJvrb8pei+p4b5M4KNx 9itLvqUKsRx38obxR0PuC4wwYQTc8Sg/23VtqGjgyi5JHolhrWpNa9YQsl4SUWp4U8fCCSBjefGq te4ROxlmGgdR7QBaGWEQFYs+dvusjRV96oP1cmFb05OHyZAZLfpWinSu+danhtKvH9pAsaSpuQPS cbIWdeXhkZC4rAXOgWX2FBHgH187+EKv5hICVo92zvI9isesxBu4AK5YVcPPq3MXlUe9sP5+k0dp Y7f6EqR6zsgzOR3cDnOA+4wJBS5p5UQFgoGIhoY+WI6m7plLfIjU5rKAaShIuBM6qQzLuCe/hQ3A 5i3Uw+OAbBH+DkNPnrywBHhKB8rPDBfx1bbfhyaO3VHMr4+RLj+xxb0AeOVQkpm2hvu5J0yjCyqf CSEgsxbFAyq6yW1bRKyj2K/uRn1rMm3cNj8TueY= X-Report-Abuse-To: spam@s01.spamexperts.axc.nl X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) 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: -4.0 (----) ----Next_Part(Wed_Mar__8_13_53_08_2017_063)-- Content-Type: Text/Plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Hi Guix, I didn't notice that building html documentation for the updated matplotlib package failed halfway. This patch fixes that, and rewrites the build procedure in a way that should make the package build fail on similar errors in the future. Thomas ----Next_Part(Wed_Mar__8_13_53_08_2017_063)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0001-gnu-python-matplotlib-documentation-Fix-build.patch" >From c16cfc0ecaa41c5e974dc9ce480eed5c16759a9a Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Tue, 7 Mar 2017 20:42:05 +0100 Subject: [PATCH] gnu: python-matplotlib-documentation: Fix build. * gnu/packages/python.scm (python-matplotlib-documentation) [native-inputs]: Add python-mock and graphviz. [arguments]: Use separate build and install phases; correctly set latex paper size. --- gnu/packages/python.scm | 61 +++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a271ad46b..0b7804e0a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3968,6 +3968,8 @@ toolkits.") ("python-sphinx" ,python-sphinx) ("python-numpydoc" ,python-numpydoc) ("python-ipython" ,python-ipython) + ("python-mock" ,python-mock) + ("graphviz" ,graphviz) ("texlive" ,texlive) ("texinfo" ,texinfo) ,@(package-native-inputs python-matplotlib))) @@ -3975,42 +3977,41 @@ toolkits.") `(#:tests? #f ; we're only generating documentation #:phases (modify-phases %standard-phases - (delete 'build) + (replace 'build + (lambda _ + (chdir "doc") + ;; Produce pdf in 'A4' format. + (substitute* "conf.py" + (("latex_paper_size = 'letter'") "") + ;; latex_paper_size is deprecated -> set paper size using + ;; latex_elements + (("latex_elements\\['pointsize'\\] = '11pt'" match) + ;; insert at a point where latex_elements{} is defined: + (string-append match "\nlatex_elements['papersize'] = 'a4paper'"))) + (zero? (system* "python" "make.py" "html" "latex" "texinfo")))) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((data (string-append (assoc-ref outputs "out") "/share")) - (doc (string-append data "/doc/" ,name "-" ,version)) + (doc (string-append data "/doc/python-matplotlib-" ,version)) (info (string-append data "/info")) (html (string-append doc "/html"))) - ;; Make installed package available for building the - ;; documentation - (with-directory-excursion "doc" - ;; Produce pdf in 'A4' format. - (substitute* (find-files "." "conf\\.py") - (("latex_paper_size = 'letter'") - "latex_paper_size = 'a4'")) - (mkdir-p html) - (mkdir-p info) - ;; The doc recommends to run the 'html' target twice. - (system* "python" "make.py" "html") - (system* "python" "make.py" "html") - (copy-recursively "build/html" html) - (system* "python" "make.py" "latex") - (system* "python" "make.py" "texinfo") + (mkdir-p html) + (mkdir-p info) + (copy-recursively "build/html" html) + (symlink (string-append html "/_images") + (string-append info "/matplotlib-figures")) + (with-directory-excursion "build/texinfo" + (substitute* "matplotlib.texi" + (("@image\\{([^,]*)" all file) + (string-append "@image{matplotlib-figures/" file))) (symlink (string-append html "/_images") - (string-append info "/matplotlib-figures")) - (with-directory-excursion "build/texinfo" - (substitute* "matplotlib.texi" - (("@image\\{([^,]*)" all file) - (string-append "@image{matplotlib-figures/" file))) - (symlink (string-append html "/_images") - "./matplotlib-figures") - (system* "makeinfo" "--no-split" - "-o" "matplotlib.info" "matplotlib.texi")) - (copy-file "build/texinfo/matplotlib.info" - (string-append info "/matplotlib.info")) - (copy-file "build/latex/Matplotlib.pdf" - (string-append doc "/Matplotlib.pdf")))) + "./matplotlib-figures") + (system* "makeinfo" "--no-split" + "-o" "matplotlib.info" "matplotlib.texi")) + (copy-file "build/texinfo/matplotlib.info" + (string-append info "/matplotlib.info")) + (copy-file "build/latex/Matplotlib.pdf" + (string-append doc "/Matplotlib.pdf"))) #t))))) (home-page (package-home-page python-matplotlib)) (synopsis "Documentation for the python-matplotlib package") -- 2.11.1 ----Next_Part(Wed_Mar__8_13_53_08_2017_063)---- ------------=_1488994322-26538-1--