emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[debbugs-tracker] bug#29572: closed ([PATCH 2/2] gnu: python-pillow: Upd


From: GNU bug Tracking System
Subject: [debbugs-tracker] bug#29572: closed ([PATCH 2/2] gnu: python-pillow: Update to 4.3.0.)
Date: Fri, 22 Dec 2017 16:53:02 +0000

Your message dated Fri, 22 Dec 2017 11:52:00 -0500
with message-id <address@hidden>
and subject line Re: [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 
4.3.0.
has caused the debbugs.gnu.org bug report #29572,
regarding [PATCH 2/2] gnu: python-pillow: Update to 4.3.0.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
29572: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=29572
GNU Bug Tracking System
Contact address@hidden with problems
--- Begin Message --- Subject: [PATCH 2/2] gnu: python-pillow: Update to 4.3.0. Date: Mon, 4 Dec 2017 19:34:22 -0500
* 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 <address@hidden>
-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




--- End Message ---
--- Begin Message --- Subject: Re: [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 4.3.0. Date: Fri, 22 Dec 2017 11:52:00 -0500 User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux)
address@hidden (Ludovic Court├Ęs) writes:

> Kei Kebreau <address@hidden> 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 <address@hidden>
>> 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!

Attachment: signature.asc
Description: PGP signature


--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]