From unknown Sun Jun 22 08:03:46 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 4.3.0. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Dec 2017 00:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 29572 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 29572@debbugs.gnu.org Cc: Kei Kebreau X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.151243409521096 (code B ref -1); Tue, 05 Dec 2017 00:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Dec 2017 00:34:55 +0000 Received: from localhost ([127.0.0.1]:46129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eM1CJ-0005UB-9Y for submit@debbugs.gnu.org; Mon, 04 Dec 2017 19:34:55 -0500 Received: from eggs.gnu.org ([208.118.235.92]:46867) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eM1CE-0005Tk-RC for submit@debbugs.gnu.org; Mon, 04 Dec 2017 19:34:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eM1C8-0000xl-Eu for submit@debbugs.gnu.org; Mon, 04 Dec 2017 19:34:45 -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,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:53449) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eM1C8-0000xd-CA for submit@debbugs.gnu.org; Mon, 04 Dec 2017 19:34:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eM1C6-0003XQ-Kh for guix-patches@gnu.org; Mon, 04 Dec 2017 19:34:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eM1C3-0000wt-4G for guix-patches@gnu.org; Mon, 04 Dec 2017 19:34:42 -0500 Received: from mout01.posteo.de ([185.67.36.65]:40116) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eM1C2-0000uL-NU for guix-patches@gnu.org; Mon, 04 Dec 2017 19:34:39 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 389A920BBA for ; Tue, 5 Dec 2017 01:34:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1512434069; bh=MSPQ0x9BtX2xk6aKeYBRUXsn9ZDcxRRKQGhbFsUsB4U=; h=From:To:Cc:Subject:Date:From; b=CZFM62bzZiDlT2XV32sFQmfph73SCajwqz1meyVdoFAekCKwAf5tXjyBoIakhzJMf doayEpTYcrXHWbpTFfWRm08Dw917d9iWTsUL4gxpR7vOXWgYsMxrtJG5JN8TtuyFic xWek0AxNFpQU5mjDz1Xt1m1NnnJb8zOUSpGV+Yyc7+WxtslxtUXmsX1MXKhlwIR5vP o6aPy/dpIlCCUPWebLMrbVCZDIEtL9/fdDDRxORY/AXBtowZG2ZWtGuLyHkyGyF5/A 4vpEwisqm2hPvXPgrKfu0QeEIb0dfq2361o2TcUQ5twYh5h4of0aJL+X3qwMLi+Zkt cB6HTOKf93BPw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3yrN6X4Mzcz9rxC; Tue, 5 Dec 2017 01:34:28 +0100 (CET) From: Kei Kebreau Date: Mon, 4 Dec 2017 19:34:22 -0500 Message-Id: <20171205003422.18643-2-kkebreau@posteo.net> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171205003422.18643-1-kkebreau@posteo.net> References: <20171205003422.18643-1-kkebreau@posteo.net> 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 (----) * gnu/packages/python.scm (python-pillow): Update to 4.3.0. * gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../python-pillow-freetype-2.7-test-failure.patch | 75 ---------------------- gnu/packages/python.scm | 7 +- 3 files changed, 4 insertions(+), 79 deletions(-) delete mode 100644 gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch diff --git a/gnu/local.mk b/gnu/local.mk index 856ade412..207c8d739 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1025,7 +1025,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pandas-skip-failing-tests.patch \ %D%/packages/patches/python-paste-remove-website-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ - %D%/packages/patches/python-pillow-freetype-2.7-test-failure.patch \ %D%/packages/patches/python-pygit2-disable-network-tests.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ diff --git a/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch b/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch deleted file mode 100644 index 18bc30bc7..000000000 --- a/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch +++ /dev/null @@ -1,75 +0,0 @@ -Fix some test failures when building with freetype-2.7. - -https://github.com/python-pillow/Pillow/issues/2116 -https://github.com/python-pillow/Pillow/pull/2286 - -Patch copied from upstream source repository: - -https://github.com/python-pillow/Pillow/commit/acf68c835c93ba144f83198306aa7e6082a43f43 - -From acf68c835c93ba144f83198306aa7e6082a43f43 Mon Sep 17 00:00:00 2001 -From: hugovk -Date: Mon, 12 Dec 2016 15:16:43 +0200 -Subject: [PATCH] Increase epsilon for FreeType 2.7 - ---- - Tests/test_imagefont.py | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py -index de89ac92..5207dce3 100644 ---- a/Tests/test_imagefont.py -+++ b/Tests/test_imagefont.py -@@ -125,7 +125,9 @@ try: - - target = 'Tests/images/rectangle_surrounding_text.png' - target_img = Image.open(target) -- self.assert_image_similar(im, target_img, .5) -+ -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 2.5) - - def test_render_multiline(self): - im = Image.new(mode='RGB', size=(300, 100)) -@@ -144,7 +146,7 @@ try: - # some versions of freetype have different horizontal spacing. - # setting a tight epsilon, I'm showing the original test failure - # at epsilon = ~38. -- self.assert_image_similar(im, target_img, .5) -+ self.assert_image_similar(im, target_img, 6.2) - - def test_render_multiline_text(self): - ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE) -@@ -158,7 +160,8 @@ try: - target = 'Tests/images/multiline_text.png' - target_img = Image.open(target) - -- self.assert_image_similar(im, target_img, .5) -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 6.2) - - # Test that text() can pass on additional arguments - # to multiline_text() -@@ -178,7 +181,8 @@ try: - target = 'Tests/images/multiline_text'+ext+'.png' - target_img = Image.open(target) - -- self.assert_image_similar(im, target_img, .5) -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 6.2) - - def test_unknown_align(self): - im = Image.new(mode='RGB', size=(300, 100)) -@@ -227,7 +231,8 @@ try: - target = 'Tests/images/multiline_text_spacing.png' - target_img = Image.open(target) - -- self.assert_image_similar(im, target_img, .5) -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 6.2) - - def test_rotated_transposed_font(self): - img_grey = Image.new("L", (100, 100)) --- -2.12.0 - diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4304cd7f5..ea4de9484 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3669,15 +3669,14 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pillow (package (name "python-pillow") - (version "3.3.3") + (version "4.3.0") (source (origin (method url-fetch) (uri (pypi-uri "Pillow" version)) - (patches (search-patches "python-pillow-freetype-2.7-test-failure.patch")) (sha256 (base32 - "0xkv0p1d73gz0a1qaasf0ai4262g8f334j07vd60bjrxs2wr3nmj")))) + "09xmn7rl6840sli2iz1k3fgxfgmri2nqz6vkinmb9mgg8ifp2z59")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) @@ -3689,6 +3688,8 @@ the OleFileIO module from PIL, the Python Image Library.") ("openjpeg" ,openjpeg) ("libtiff" ,libtiff) ("libwebp" ,libwebp))) + (propagated-inputs + `(("python-olefile" ,python-olefile))) (arguments `(#:phases (modify-phases %standard-phases (add-after -- 2.15.0 From unknown Sun Jun 22 08:03:46 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 4.3.0. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Dec 2017 09:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 29572 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Kei Kebreau Cc: 29572@debbugs.gnu.org Received: via spool by 29572-submit@debbugs.gnu.org id=B29572.151341673132009 (code B ref 29572); Sat, 16 Dec 2017 09:33:02 +0000 Received: (at 29572) by debbugs.gnu.org; 16 Dec 2017 09:32:11 +0000 Received: from localhost ([127.0.0.1]:36409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eQ8pH-0008KD-2e for submit@debbugs.gnu.org; Sat, 16 Dec 2017 04:32:11 -0500 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21065) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eQ8pD-0008K2-7l for 29572@debbugs.gnu.org; Sat, 16 Dec 2017 04:32:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1513413968; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:To:Cc:Subject:In-reply-to:Date:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-ID; l=520; bh=dNaLEd7+y9IrxNU+ZZdIstsLWOOmPnjEZA3puazH96Y=; b=dH1Fgbxxt+aAcJ4Mmdl25Bfcq/g++T1Bt4lfsNUWcSdYeLYIAK6/q6dhaIhAVFyA fdOAFRJFQNqRlAYdVRNHUwaDi9QJq+sVWBjZcHjGO8dvtxSNX+BTtUP2gRCvOuedN9g UyUtpzkwSIPuAipdmBIcClmgA+94xIXO+Zjle//4= Received: from localhost (port-92-200-20-179.dynamic.qsc.de [92.200.20.179]) by mx.zohomail.com with SMTPS id 1513413967992374.99354355354944; Sat, 16 Dec 2017 00:46:07 -0800 (PST) References: <20171205003422.18643-1-kkebreau@posteo.net> <20171205003422.18643-2-kkebreau@posteo.net> User-agent: mu4e 0.9.18; emacs 25.3.1 From: Ricardo Wurmus In-reply-to: <20171205003422.18643-2-kkebreau@posteo.net> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Sat, 16 Dec 2017 09:46:03 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Message-ID: <87o9mznjqs.fsf@elephly.net> X-ZohoMailClient: External X-Spam-Score: 0.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: 0.0 (/) Hi Kei, > * gnu/packages/python.scm (python-pillow): Update to 4.3.0. > * gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch: > Delete file. > * gnu/local.mk (dist_patch_DATA): Remove it. [=E2=80=A6] > + (propagated-inputs > + `(("python-olefile" ,python-olefile))) The commit message fails to mention python-olefile. I cannot find a definition for python-olefile; did you forget to attach it? -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sun Jun 22 08:03:46 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 4.3.0. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Dec 2017 15:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 29572 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ricardo Wurmus Cc: 29572@debbugs.gnu.org Received: via spool by 29572-submit@debbugs.gnu.org id=B29572.15134373666030 (code B ref 29572); Sat, 16 Dec 2017 15:17:01 +0000 Received: (at 29572) by debbugs.gnu.org; 16 Dec 2017 15:16:06 +0000 Received: from localhost ([127.0.0.1]:37498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eQEC2-0001Z2-HR for submit@debbugs.gnu.org; Sat, 16 Dec 2017 10:16:06 -0500 Received: from mout01.posteo.de ([185.67.36.65]:37687) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eQEBy-0001YN-5n for 29572@debbugs.gnu.org; Sat, 16 Dec 2017 10:16:01 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 09A8420E37 for <29572@debbugs.gnu.org>; Sat, 16 Dec 2017 16:15:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1513437352; bh=h0MG16MwrIF9kPyp9jvOl61n8dSESCqCjqfw/Oz3lDc=; h=From:To:Cc:Subject:Date:From; b=gf+ZOJYV7/BSoBy2AWivaIlRWzcqFoyYpOsYnBcGegwlEoWqZWYPjVuitf7WiVmGW envpQltrieF6rhDyIDcV59pnIe9Zf4zxsai7zVGLewxfwXEU8hd22CyQWyxhZnKiL/ ZIoBFxZfjmZw4KDH0nHey7SBPRfdPG5jAmWKtj2yUnjwuUeGoAfQlBrZ4LEJTHpDgk bNuQQg5CXH8n6VrrYx9UXzdQOG0Y2C37VNDMVLAE9n98RcJ/Tmjo54u/0YBs3hXix4 Q2N0FLI3UmWgl3oYynWZYPN5FVINkGhmvyUNMia6aBVWQyNdk/lsU9+56EAulFpvG5 28qU6I/7FeaNg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3yzW8Q3Bqnz9rxP; Sat, 16 Dec 2017 16:15:50 +0100 (CET) From: Kei Kebreau References: <20171205003422.18643-1-kkebreau@posteo.net> <20171205003422.18643-2-kkebreau@posteo.net> <87o9mznjqs.fsf@elephly.net> Date: Sat, 16 Dec 2017 10:15:48 -0500 In-Reply-To: <87o9mznjqs.fsf@elephly.net> (Ricardo Wurmus's message of "Sat, 16 Dec 2017 09:46:03 +0100") Message-ID: <87zi6izot7.fsf@posteo.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) 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: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ricardo Wurmus writes: > Hi Kei, > >> * gnu/packages/python.scm (python-pillow): Update to 4.3.0. >> * gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch: >> Delete file. >> * gnu/local.mk (dist_patch_DATA): Remove it. > [=E2=80=A6] >> + (propagated-inputs >> + `(("python-olefile" ,python-olefile))) > > The commit message fails to mention python-olefile. I cannot find a > definition for python-olefile; did you forget to attach it? > I've attached a patch with a corrected commit message. The definition for python-olefile ended up as a different bug number (#29571). Thanks for looking at this. > -- > Ricardo > > GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC > https://elephly.net --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=0001-gnu-python-pillow-Update-to-4.3.0.patch Content-Transfer-Encoding: quoted-printable From=2039d41a2c43598d0ebbad46ee552afe683305f031 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 4 Dec 2017 17:56:37 -0500 Subject: [PATCH] gnu: python-pillow: Update to 4.3.0. * gnu/packages/python.scm (python-pillow): Update to 4.3.0. [propagated-inputs]: Add python-olefile. * gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. =2D-- gnu/local.mk | 1 - .../python-pillow-freetype-2.7-test-failure.patch | 75 ------------------= ---- gnu/packages/python.scm | 7 +- 3 files changed, 4 insertions(+), 79 deletions(-) delete mode 100644 gnu/packages/patches/python-pillow-freetype-2.7-test-fa= ilure.patch diff --git a/gnu/local.mk b/gnu/local.mk index 636919550..d7f4fb745 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1022,7 +1022,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/python-pandas-skip-failing-tests.patch \ %D%/packages/patches/python-paste-remove-website-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ =2D %D%/packages/patches/python-pillow-freetype-2.7-test-failure.patch \ %D%/packages/patches/python-pygit2-disable-network-tests.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch= \ diff --git a/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.p= atch b/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch deleted file mode 100644 index 18bc30bc7..000000000 =2D-- a/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch +++ /dev/null @@ -1,75 +0,0 @@ =2DFix some test failures when building with freetype-2.7. =2D =2Dhttps://github.com/python-pillow/Pillow/issues/2116 =2Dhttps://github.com/python-pillow/Pillow/pull/2286 =2D =2DPatch copied from upstream source repository: =2D =2Dhttps://github.com/python-pillow/Pillow/commit/acf68c835c93ba144f8319830= 6aa7e6082a43f43 =2D =2DFrom acf68c835c93ba144f83198306aa7e6082a43f43 Mon Sep 17 00:00:00 2001 =2DFrom: hugovk =2DDate: Mon, 12 Dec 2016 15:16:43 +0200 =2DSubject: [PATCH] Increase epsilon for FreeType 2.7 =2D =2D--- =2D Tests/test_imagefont.py | 15 ++++++++++----- =2D 1 file changed, 10 insertions(+), 5 deletions(-) =2D =2Ddiff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py =2Dindex de89ac92..5207dce3 100644 =2D--- a/Tests/test_imagefont.py =2D+++ b/Tests/test_imagefont.py =2D@@ -125,7 +125,9 @@ try: =2D=20 =2D target =3D 'Tests/images/rectangle_surrounding_text.png' =2D target_img =3D Image.open(target) =2D- self.assert_image_similar(im, target_img, .5) =2D+ =2D+ # Epsilon ~.5 fails with FreeType 2.7 =2D+ self.assert_image_similar(im, target_img, 2.5) =2D=20 =2D def test_render_multiline(self): =2D im =3D Image.new(mode=3D'RGB', size=3D(300, 100)) =2D@@ -144,7 +146,7 @@ try: =2D # some versions of freetype have different horizontal spaci= ng. =2D # setting a tight epsilon, I'm showing the original test fa= ilure =2D # at epsilon =3D ~38. =2D- self.assert_image_similar(im, target_img, .5) =2D+ self.assert_image_similar(im, target_img, 6.2) =2D=20 =2D def test_render_multiline_text(self): =2D ttf =3D ImageFont.truetype(FONT_PATH, FONT_SIZE) =2D@@ -158,7 +160,8 @@ try: =2D target =3D 'Tests/images/multiline_text.png' =2D target_img =3D Image.open(target) =2D=20 =2D- self.assert_image_similar(im, target_img, .5) =2D+ # Epsilon ~.5 fails with FreeType 2.7 =2D+ self.assert_image_similar(im, target_img, 6.2) =2D=20 =2D # Test that text() can pass on additional arguments =2D # to multiline_text() =2D@@ -178,7 +181,8 @@ try: =2D target =3D 'Tests/images/multiline_text'+ext+'.png' =2D target_img =3D Image.open(target) =2D=20 =2D- self.assert_image_similar(im, target_img, .5) =2D+ # Epsilon ~.5 fails with FreeType 2.7 =2D+ self.assert_image_similar(im, target_img, 6.2) =2D=20 =2D def test_unknown_align(self): =2D im =3D Image.new(mode=3D'RGB', size=3D(300, 100)) =2D@@ -227,7 +231,8 @@ try: =2D target =3D 'Tests/images/multiline_text_spacing.png' =2D target_img =3D Image.open(target) =2D=20 =2D- self.assert_image_similar(im, target_img, .5) =2D+ # Epsilon ~.5 fails with FreeType 2.7 =2D+ self.assert_image_similar(im, target_img, 6.2) =2D=20 =2D def test_rotated_transposed_font(self): =2D img_grey =3D Image.new("L", (100, 100)) =2D--=20 =2D2.12.0 =2D diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 082856bfb..5db90df3e 100644 =2D-- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3660,15 +3660,14 @@ services for your Python modules and applications.") (define-public python-pillow (package (name "python-pillow") =2D (version "3.3.3") + (version "4.3.0") (source (origin (method url-fetch) (uri (pypi-uri "Pillow" version)) =2D (patches (search-patches "python-pillow-freetype-2.7-test-failure= .patch")) (sha256 (base32 =2D "0xkv0p1d73gz0a1qaasf0ai4262g8f334j07vd60bjrxs2wr3nmj")))) + "09xmn7rl6840sli2iz1k3fgxfgmri2nqz6vkinmb9mgg8ifp2z59")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) @@ -3680,6 +3679,8 @@ services for your Python modules and applications.") ("openjpeg" ,openjpeg) ("libtiff" ,libtiff) ("libwebp" ,libwebp))) + (propagated-inputs + `(("python-olefile" ,python-olefile))) (arguments `(#:phases (modify-phases %standard-phases (add-after =2D-=20 2.15.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlo1OKQACgkQ5qXuPBlG eg0nyQ/+L9bBcblNHMzNt9m/0sFZESD7eJ4P/pru0qo5LhIJWDDY0dwqcBeq+l8E HQESUxDNVlNN8SG3Lzu6YspfEvQ5Ph+b/QSxGXWEVWZKfMOKYGrsri+jnpkKw6Yy MJz3iMnszvSyQC72GxOrJEzvgXu2RJxL/yBY7EHMv5cHTXON5l+Dg9XDDsUoYNao jAz0qHOgeqv+8PSsT6jcYGckOxX2tHF/sKWTXzGlnDZy30X2yTcLEHL461dDxdEu qEE+yOHuuiMrSv5Hb5aXSGewYl3iP6Ldn3G4Ok+9dzZyriBIuJbr+Cncl7KzLx1P xPkt3BXv88m+a1Sql4IxWwpapG22HF+hQd1X31U3vH/zTsDYjVsuY7xBCL7kB3bs ATSqKssCh6v/MH+cg0CV49vZ8pPym2zWRup898IifqdhZWlNCHmS5Jemp7UCTvRO DQ4BhHcYuY+YdggFnaCtsQagXS/DWQ9Uk6TlK69iMm/6HXjnceftTGQwfqJfe4O4 1NeSJQFHBQs57pmRtm0TfTlkF0CPec4C/qLwmIET81X8mpzIYSm+5tjGYGzxxkiF xNxXbjewWBY8znQm5F0+6k8sv08gKwptqFqENEXu5P/1S3OHi+5VUYHnK/39v9x7 nAswWSbgw23jDbTYoc1jkogEW3vih3UQ97yUEoSlNMiw+Vb1iOg= =sgFX -----END PGP SIGNATURE----- --==-=-=-- From unknown Sun Jun 22 08:03:46 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 4.3.0. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Dec 2017 09:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 29572 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Kei Kebreau Cc: Ricardo Wurmus , 29572@debbugs.gnu.org Received: via spool by 29572-submit@debbugs.gnu.org id=B29572.151393334712951 (code B ref 29572); Fri, 22 Dec 2017 09:03:03 +0000 Received: (at 29572) by debbugs.gnu.org; 22 Dec 2017 09:02:27 +0000 Received: from localhost ([127.0.0.1]:46835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eSJDn-0003Mo-G0 for submit@debbugs.gnu.org; Fri, 22 Dec 2017 04:02:27 -0500 Received: from hera.aquilenet.fr ([141.255.128.1]:51760) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eSJDi-0003Mb-3c for 29572@debbugs.gnu.org; Fri, 22 Dec 2017 04:02:25 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 5A86710041; Fri, 22 Dec 2017 10:02:25 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 81C_ciZVAxTc; Fri, 22 Dec 2017 10:02:24 +0100 (CET) Received: from ribbon (unknown [193.50.110.235]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 5951CFE6C; Fri, 22 Dec 2017 10:02:24 +0100 (CET) From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20171205003422.18643-1-kkebreau@posteo.net> <20171205003422.18643-2-kkebreau@posteo.net> <87o9mznjqs.fsf@elephly.net> <87zi6izot7.fsf@posteo.net> Date: Fri, 22 Dec 2017 10:02:20 +0100 In-Reply-To: <87zi6izot7.fsf@posteo.net> (Kei Kebreau's message of "Sat, 16 Dec 2017 10:15:48 -0500") Message-ID: <874lojb0f7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 1.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: 1.0 (+) Kei Kebreau skribis: > I've attached a patch with a corrected commit message. The definition > for python-olefile ended up as a different bug number (#29571). [...] > From 39d41a2c43598d0ebbad46ee552afe683305f031 Mon Sep 17 00:00:00 2001 > From: Kei Kebreau > Date: Mon, 4 Dec 2017 17:56:37 -0500 > Subject: [PATCH] gnu: python-pillow: Update to 4.3.0. > > * gnu/packages/python.scm (python-pillow): Update to 4.3.0. > [propagated-inputs]: Add python-olefile. > * gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch: > Delete file. > * gnu/local.mk (dist_patch_DATA): Remove it. The commit message looks great to me. ;-) Please push, thank you! Ludo'. From unknown Sun Jun 22 08:03:46 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: Kei Kebreau Subject: bug#29572: closed (Re: [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 4.3.0.) Message-ID: References: <87608yyabz.fsf@posteo.net> <20171205003422.18643-2-kkebreau@posteo.net> X-Gnu-PR-Message: they-closed 29572 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 29572@debbugs.gnu.org Date: Fri, 22 Dec 2017 16:53:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1513961582-3136-1" This is a multi-part message in MIME format... ------------=_1513961582-3136-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #29572: [PATCH 2/2] gnu: python-pillow: Update to 4.3.0. 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 29572@debbugs.gnu.org. --=20 29572: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D29572 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1513961582-3136-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 29572-done) by debbugs.gnu.org; 22 Dec 2017 16:52:17 +0000 Received: from localhost ([127.0.0.1]:48249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eSQYT-0000ne-CY for submit@debbugs.gnu.org; Fri, 22 Dec 2017 11:52:17 -0500 Received: from mout01.posteo.de ([185.67.36.65]:45823) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eSQYP-0000nP-Pr for 29572-done@debbugs.gnu.org; Fri, 22 Dec 2017 11:52:16 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 1C10920F36 for <29572-done@debbugs.gnu.org>; Fri, 22 Dec 2017 17:52:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1513961528; bh=tq1QWzNnggtB5MwNRICNc3iEDhlGqLGx+24mYBwB1s4=; h=From:To:Cc:Subject:Date:From; b=Y5S2kP3EBB4X+4QdYKTVAL5hga2t+Km7eDoscVMZFUDpN6WghJWXQCtYRUkMjXVah AiNq9AjWJ+ccVZ8mceFLdlhgBU7/wnp+osSb77bkVTbDEO92hxVYmQvmBUpA9wCTno I1WLtx+jorPRL0DLNZuagyNNYhZENw2n9g9Iz6zK0RwTGivRo1y8lORQQcuai8uhYx sJlZ8UWkzV12Q1ldHK62fpEDoQQDzBJCnTtgMpea6LRmRt/Wzbft/TnmTWjzWzxi/H GItUGZnN60b2BzaJnZwZwQeGK6wNMY7rpoDLSJ4WyFoZW9lM6NO6vNpdM/pE+2WQKy P8vOEfQwXmF2g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3z3F0k4Gwrz9rxC; Fri, 22 Dec 2017 17:52:06 +0100 (CET) From: Kei Kebreau To: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 4.3.0. References: <20171205003422.18643-1-kkebreau@posteo.net> <20171205003422.18643-2-kkebreau@posteo.net> <87o9mznjqs.fsf@elephly.net> <87zi6izot7.fsf@posteo.net> <874lojb0f7.fsf@gnu.org> Date: Fri, 22 Dec 2017 11:52:00 -0500 In-Reply-To: <874lojb0f7.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Fri, 22 Dec 2017 10:02:20 +0100") Message-ID: <87608yyabz.fsf@posteo.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 29572-done Cc: Ricardo Wurmus , 29572-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: -2.3 (--) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ludo@gnu.org (Ludovic Court=C3=A8s) writes: > Kei Kebreau skribis: > >> I've attached a patch with a corrected commit message. The definition >> for python-olefile ended up as a different bug number (#29571). > > [...] > >> From 39d41a2c43598d0ebbad46ee552afe683305f031 Mon Sep 17 00:00:00 2001 >> From: Kei Kebreau >> Date: Mon, 4 Dec 2017 17:56:37 -0500 >> Subject: [PATCH] gnu: python-pillow: Update to 4.3.0. >> >> * gnu/packages/python.scm (python-pillow): Update to 4.3.0. >> [propagated-inputs]: Add python-olefile. >> * gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch: >> Delete file. >> * gnu/local.mk (dist_patch_DATA): Remove it. > > The commit message looks great to me. ;-) > > Please push, thank you! > > Ludo'. Done! Thank you for reviewing! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlo9ODAACgkQ5qXuPBlG eg0HTw//X8B6mH5lkN3QuLWP4rAicqC28eIQ5yEw3vtgOd1LQ+QXPlR2ohGTviFk HHaFLwMavVlTMk7mB/ZjSZVhpUAugdtAeMDnZ5ObvU2eA/FDF6zhSojC8jhAkbZi 76FLvlKd8m9wY4XhvbL6lNAwaQ27Z19y/8Hwk0WyF46U/+KtFNJsbYbInYe7IShp 9rKYfppbdv+VMJPjzqUJvpeFyIYGq7hcQzJWjf1gtYZVslUrEUd92arF+oeFHy6i e2/oARYFS8+QfkiUCdSWunlMD0hktHXmbOYZAN9X4SRWmY2rffDVsakcbGMnxTw9 7dxvO4bn/WTSlGMoDDDk2tccIwwDOyVHNUODvpaZcd+S8jyUnYXfVICxalmPq7/d QqnxKKYtAszpqvmfP91lwei0DQaax+sVpizvEHn9+ffeJlziVfrHsTgxa3K9d19n poDTR6lxg/tN6x8FvJt8Z8SwR6KDAa0YyyLlGYXL50yja07MX7uuC9YWA0KVe2ly Wh2MzzkUkvuVzmWumIExlsOTbt/odP8d0TFSBjek5GFYmQc92yvxlfyVzRpsM7WR cZtbbyw0ROIupt9HAnMAiJO+p79DlKXocz8dZNcAl6uCPblCBR0NGQ83S/cfh+it YW/DXiFbc7J+3BXoRuvOnd5RUzmwohmn7/i5nHH8YolaJKBCrdk= =CWQy -----END PGP SIGNATURE----- --=-=-=-- ------------=_1513961582-3136-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 5 Dec 2017 00:34:55 +0000 Received: from localhost ([127.0.0.1]:46129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eM1CJ-0005UB-9Y for submit@debbugs.gnu.org; Mon, 04 Dec 2017 19:34:55 -0500 Received: from eggs.gnu.org ([208.118.235.92]:46867) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eM1CE-0005Tk-RC for submit@debbugs.gnu.org; Mon, 04 Dec 2017 19:34:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eM1C8-0000xl-Eu for submit@debbugs.gnu.org; Mon, 04 Dec 2017 19:34:45 -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,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:53449) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eM1C8-0000xd-CA for submit@debbugs.gnu.org; Mon, 04 Dec 2017 19:34:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eM1C6-0003XQ-Kh for guix-patches@gnu.org; Mon, 04 Dec 2017 19:34:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eM1C3-0000wt-4G for guix-patches@gnu.org; Mon, 04 Dec 2017 19:34:42 -0500 Received: from mout01.posteo.de ([185.67.36.65]:40116) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eM1C2-0000uL-NU for guix-patches@gnu.org; Mon, 04 Dec 2017 19:34:39 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 389A920BBA for ; Tue, 5 Dec 2017 01:34:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1512434069; bh=MSPQ0x9BtX2xk6aKeYBRUXsn9ZDcxRRKQGhbFsUsB4U=; h=From:To:Cc:Subject:Date:From; b=CZFM62bzZiDlT2XV32sFQmfph73SCajwqz1meyVdoFAekCKwAf5tXjyBoIakhzJMf doayEpTYcrXHWbpTFfWRm08Dw917d9iWTsUL4gxpR7vOXWgYsMxrtJG5JN8TtuyFic xWek0AxNFpQU5mjDz1Xt1m1NnnJb8zOUSpGV+Yyc7+WxtslxtUXmsX1MXKhlwIR5vP o6aPy/dpIlCCUPWebLMrbVCZDIEtL9/fdDDRxORY/AXBtowZG2ZWtGuLyHkyGyF5/A 4vpEwisqm2hPvXPgrKfu0QeEIb0dfq2361o2TcUQ5twYh5h4of0aJL+X3qwMLi+Zkt cB6HTOKf93BPw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3yrN6X4Mzcz9rxC; Tue, 5 Dec 2017 01:34:28 +0100 (CET) From: Kei Kebreau To: guix-patches@gnu.org Subject: [PATCH 2/2] gnu: python-pillow: Update to 4.3.0. Date: Mon, 4 Dec 2017 19:34:22 -0500 Message-Id: <20171205003422.18643-2-kkebreau@posteo.net> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171205003422.18643-1-kkebreau@posteo.net> References: <20171205003422.18643-1-kkebreau@posteo.net> 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 Cc: Kei Kebreau 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 (----) * gnu/packages/python.scm (python-pillow): Update to 4.3.0. * gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../python-pillow-freetype-2.7-test-failure.patch | 75 ---------------------- gnu/packages/python.scm | 7 +- 3 files changed, 4 insertions(+), 79 deletions(-) delete mode 100644 gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch diff --git a/gnu/local.mk b/gnu/local.mk index 856ade412..207c8d739 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1025,7 +1025,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pandas-skip-failing-tests.patch \ %D%/packages/patches/python-paste-remove-website-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ - %D%/packages/patches/python-pillow-freetype-2.7-test-failure.patch \ %D%/packages/patches/python-pygit2-disable-network-tests.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ diff --git a/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch b/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch deleted file mode 100644 index 18bc30bc7..000000000 --- a/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch +++ /dev/null @@ -1,75 +0,0 @@ -Fix some test failures when building with freetype-2.7. - -https://github.com/python-pillow/Pillow/issues/2116 -https://github.com/python-pillow/Pillow/pull/2286 - -Patch copied from upstream source repository: - -https://github.com/python-pillow/Pillow/commit/acf68c835c93ba144f83198306aa7e6082a43f43 - -From acf68c835c93ba144f83198306aa7e6082a43f43 Mon Sep 17 00:00:00 2001 -From: hugovk -Date: Mon, 12 Dec 2016 15:16:43 +0200 -Subject: [PATCH] Increase epsilon for FreeType 2.7 - ---- - Tests/test_imagefont.py | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py -index de89ac92..5207dce3 100644 ---- a/Tests/test_imagefont.py -+++ b/Tests/test_imagefont.py -@@ -125,7 +125,9 @@ try: - - target = 'Tests/images/rectangle_surrounding_text.png' - target_img = Image.open(target) -- self.assert_image_similar(im, target_img, .5) -+ -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 2.5) - - def test_render_multiline(self): - im = Image.new(mode='RGB', size=(300, 100)) -@@ -144,7 +146,7 @@ try: - # some versions of freetype have different horizontal spacing. - # setting a tight epsilon, I'm showing the original test failure - # at epsilon = ~38. -- self.assert_image_similar(im, target_img, .5) -+ self.assert_image_similar(im, target_img, 6.2) - - def test_render_multiline_text(self): - ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE) -@@ -158,7 +160,8 @@ try: - target = 'Tests/images/multiline_text.png' - target_img = Image.open(target) - -- self.assert_image_similar(im, target_img, .5) -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 6.2) - - # Test that text() can pass on additional arguments - # to multiline_text() -@@ -178,7 +181,8 @@ try: - target = 'Tests/images/multiline_text'+ext+'.png' - target_img = Image.open(target) - -- self.assert_image_similar(im, target_img, .5) -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 6.2) - - def test_unknown_align(self): - im = Image.new(mode='RGB', size=(300, 100)) -@@ -227,7 +231,8 @@ try: - target = 'Tests/images/multiline_text_spacing.png' - target_img = Image.open(target) - -- self.assert_image_similar(im, target_img, .5) -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 6.2) - - def test_rotated_transposed_font(self): - img_grey = Image.new("L", (100, 100)) --- -2.12.0 - diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4304cd7f5..ea4de9484 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3669,15 +3669,14 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pillow (package (name "python-pillow") - (version "3.3.3") + (version "4.3.0") (source (origin (method url-fetch) (uri (pypi-uri "Pillow" version)) - (patches (search-patches "python-pillow-freetype-2.7-test-failure.patch")) (sha256 (base32 - "0xkv0p1d73gz0a1qaasf0ai4262g8f334j07vd60bjrxs2wr3nmj")))) + "09xmn7rl6840sli2iz1k3fgxfgmri2nqz6vkinmb9mgg8ifp2z59")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) @@ -3689,6 +3688,8 @@ the OleFileIO module from PIL, the Python Image Library.") ("openjpeg" ,openjpeg) ("libtiff" ,libtiff) ("libwebp" ,libwebp))) + (propagated-inputs + `(("python-olefile" ,python-olefile))) (arguments `(#:phases (modify-phases %standard-phases (add-after -- 2.15.0 ------------=_1513961582-3136-1--