From 6abc0d2f40e79bc96c1e25a5127642d9746b4d17 Mon Sep 17 00:00:00 2001 From: wiredfool Date: Mon, 29 Sep 2014 13:00:19 -0700 Subject: [PATCH 1/6] Version Bump - 2.6.0-rc1 --- CHANGES.rst | 2 +- PIL/__init__.py | 2 +- _imaging.c | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 81ba0d0e0..f7a0a7f84 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,7 +1,7 @@ Changelog (Pillow) ================== -2.6.0 (unreleased) +2.6.0-rc1 (2014-09-29) ------------------ - Use redistributable image for testing #884 diff --git a/PIL/__init__.py b/PIL/__init__.py index c6e27d791..30e845182 100644 --- a/PIL/__init__.py +++ b/PIL/__init__.py @@ -12,7 +12,7 @@ # ;-) VERSION = '1.1.7' # PIL version -PILLOW_VERSION = '2.5.3' # Pillow +PILLOW_VERSION = '2.6.0-rc1' # Pillow _plugins = ['BmpImagePlugin', 'BufrStubImagePlugin', diff --git a/_imaging.c b/_imaging.c index ec8205dd4..2b5825dd8 100644 --- a/_imaging.c +++ b/_imaging.c @@ -71,7 +71,7 @@ * See the README file for information on usage and redistribution. */ -#define PILLOW_VERSION "2.5.3" +#define PILLOW_VERSION "2.6.0-rc1" #include "Python.h" diff --git a/setup.py b/setup.py index 46293fbc8..4bce62e36 100644 --- a/setup.py +++ b/setup.py @@ -90,7 +90,7 @@ except (ImportError, OSError): NAME = 'Pillow' -PILLOW_VERSION = '2.5.3' +PILLOW_VERSION = '2.6.0-rc1' TCL_ROOT = None JPEG_ROOT = None JPEG2K_ROOT = None From 81ebc21abfdd9d152f05d8516b17efba26e4d5b7 Mon Sep 17 00:00:00 2001 From: wiredfool Date: Mon, 29 Sep 2014 13:14:32 -0700 Subject: [PATCH 2/6] Relax pyroma for RC versions --- Tests/test_pyroma.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Tests/test_pyroma.py b/Tests/test_pyroma.py index 45d62b82f..59aa3810e 100644 --- a/Tests/test_pyroma.py +++ b/Tests/test_pyroma.py @@ -1,5 +1,7 @@ from helper import unittest, PillowTestCase +from PIL import PILLOW_VERSION + try: import pyroma except ImportError: @@ -23,8 +25,14 @@ class TestPyroma(PillowTestCase): rating = pyroma.ratings.rate(data) # Assert - # Should have a perfect score - self.assertEqual(rating, (10, [])) + if 'rc' in PILLOW_VERSION: + #Pyroma needs to chill about RC versions and not kill all our tests. + self.assertEqual(rating, (9, + ['The packages version number does not comply with PEP-386.'])) + + else: + # Should have a perfect score + self.assertEqual(rating, (10, [])) if __name__ == '__main__': From 383f7130758578d14c02fee9b1e2c0b6069e7771 Mon Sep 17 00:00:00 2001 From: Eric Soroos Date: Mon, 29 Sep 2014 16:36:09 -0700 Subject: [PATCH 3/6] Relax exact equals to approximate --- Tests/test_file_gimpgradient.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/test_file_gimpgradient.py b/Tests/test_file_gimpgradient.py index c64deb79d..c54dca7c1 100644 --- a/Tests/test_file_gimpgradient.py +++ b/Tests/test_file_gimpgradient.py @@ -80,7 +80,7 @@ class TestImage(PillowTestCase): ret = GimpGradientFile.sphere_increasing(middle, pos) # Assert - self.assertEqual(ret, 0.9682458365518543) + self.assert_almost_equal(ret, 0.9682458365518543) def test_sphere_decreasing(self): # Arrange From 1a91078154a16a3c2d32a8858ace8c1e6aa697af Mon Sep 17 00:00:00 2001 From: Eric Soroos Date: Mon, 29 Sep 2014 22:14:26 -0700 Subject: [PATCH 4/6] Test failure explanation on PPC --- Tests/test_imagefile.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Tests/test_imagefile.py b/Tests/test_imagefile.py index 3556661ae..662a3bfb0 100644 --- a/Tests/test_imagefile.py +++ b/Tests/test_imagefile.py @@ -55,6 +55,12 @@ class TestImageFile(PillowTestCase): if EpsImagePlugin.has_ghostscript(): im1, im2 = roundtrip("EPS") + # This test fails on Ubuntu 12.04, PPC (Bigendian) It + # appears to be a ghostscript 9.05 bug, since the + # ghostscript rendering is wonky and the file is identical + # to that written on ubuntu 12.04 x64 + # md5sum: ba974835ff2d6f3f2fd0053a23521d4a + # EPS comes back in RGB: self.assert_image_similar(im1, im2.convert('L'), 20) From 1bb850427dca1a29156abb2580d6411b57966795 Mon Sep 17 00:00:00 2001 From: wiredfool Date: Tue, 30 Sep 2014 08:33:29 -0700 Subject: [PATCH 5/6] Slightly relax imagedraw tests to pass on x86 --- Tests/test_imagedraw.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py index ad0f33530..6adc6c1f2 100644 --- a/Tests/test_imagedraw.py +++ b/Tests/test_imagedraw.py @@ -63,8 +63,8 @@ class TestImageDraw(PillowTestCase): del draw # Assert - self.assert_image_equal( - im, Image.open("Tests/images/imagedraw_arc.png")) + self.assert_image_similar( + im, Image.open("Tests/images/imagedraw_arc.png"),1) def test_arc1(self): self.helper_arc(BBOX1) @@ -96,8 +96,8 @@ class TestImageDraw(PillowTestCase): del draw # Assert - self.assert_image_equal( - im, Image.open("Tests/images/imagedraw_chord.png")) + self.assert_image_similar( + im, Image.open("Tests/images/imagedraw_chord.png"),1) def test_chord1(self): self.helper_chord(BBOX1) @@ -115,8 +115,8 @@ class TestImageDraw(PillowTestCase): del draw # Assert - self.assert_image_equal( - im, Image.open("Tests/images/imagedraw_ellipse.png")) + self.assert_image_similar( + im, Image.open("Tests/images/imagedraw_ellipse.png"),1) def test_ellipse1(self): self.helper_ellipse(BBOX1) @@ -153,8 +153,8 @@ class TestImageDraw(PillowTestCase): del draw # Assert - self.assert_image_equal( - im, Image.open("Tests/images/imagedraw_pieslice.png")) + self.assert_image_similar( + im, Image.open("Tests/images/imagedraw_pieslice.png"),1) def test_pieslice1(self): self.helper_pieslice(BBOX1) From 9634e437efeeda906ad6bfcc275b17732d64f32a Mon Sep 17 00:00:00 2001 From: wiredfool Date: Wed, 1 Oct 2014 09:59:00 -0700 Subject: [PATCH 6/6] Version Bump -- 2.6.0 --- CHANGES.rst | 8 +++++++- PIL/__init__.py | 2 +- _imaging.c | 2 +- setup.py | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index f7a0a7f84..52419088f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,9 +1,15 @@ Changelog (Pillow) ================== -2.6.0-rc1 (2014-09-29) +2.6.0 (2014-10-01) ------------------ +- Relax precision of ImageDraw tests for x86, GimpGradient for PPC + [wiredfool] + +2.6.0-rc1 (2014-09-29) +---------------------- + - Use redistributable image for testing #884 [hugovk] diff --git a/PIL/__init__.py b/PIL/__init__.py index 30e845182..1bb1250c8 100644 --- a/PIL/__init__.py +++ b/PIL/__init__.py @@ -12,7 +12,7 @@ # ;-) VERSION = '1.1.7' # PIL version -PILLOW_VERSION = '2.6.0-rc1' # Pillow +PILLOW_VERSION = '2.6.0' # Pillow _plugins = ['BmpImagePlugin', 'BufrStubImagePlugin', diff --git a/_imaging.c b/_imaging.c index 2b5825dd8..1759d4c8d 100644 --- a/_imaging.c +++ b/_imaging.c @@ -71,7 +71,7 @@ * See the README file for information on usage and redistribution. */ -#define PILLOW_VERSION "2.6.0-rc1" +#define PILLOW_VERSION "2.6.0" #include "Python.h" diff --git a/setup.py b/setup.py index 4bce62e36..2d8cafa34 100644 --- a/setup.py +++ b/setup.py @@ -90,7 +90,7 @@ except (ImportError, OSError): NAME = 'Pillow' -PILLOW_VERSION = '2.6.0-rc1' +PILLOW_VERSION = '2.6.0' TCL_ROOT = None JPEG_ROOT = None JPEG2K_ROOT = None