From: Kei Kebreau <kkebreau@posteo.net>
To: 29572@debbugs.gnu.org
Cc: Kei Kebreau <kkebreau@posteo.net>
Subject: [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 4.3.0.
Date: Mon, 4 Dec 2017 19:34:22 -0500 [thread overview]
Message-ID: <20171205003422.18643-2-kkebreau@posteo.net> (raw)
In-Reply-To: <20171205003422.18643-1-kkebreau@posteo.net>
* 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 <hugovk@users.noreply.github.com>
-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
next prev parent reply other threads:[~2017-12-05 0:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-05 0:34 [bug#29571] [PATCH 1/2] gnu: Add python-olefile Kei Kebreau
2017-12-05 0:34 ` Kei Kebreau [this message]
2017-12-16 8:46 ` [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 4.3.0 Ricardo Wurmus
2017-12-16 15:15 ` Kei Kebreau
2017-12-22 9:02 ` Ludovic Courtès
2017-12-22 16:52 ` bug#29572: " Kei Kebreau
2017-12-22 9:01 ` [bug#29571] [PATCH 1/2] gnu: Add python-olefile Ludovic Courtès
2017-12-22 16:51 ` bug#29571: " Kei Kebreau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171205003422.18643-2-kkebreau@posteo.net \
--to=kkebreau@posteo.net \
--cc=29572@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).