Merge branch '2.6.x'

CHANGES.rst

@@ -1,9 +1,15 @@
 Changelog (Pillow)
 ==================
 
-2.6.0 (unreleased)
+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]
 

PIL/__init__.py

@@ -12,7 +12,7 @@
 # ;-)
 
 VERSION = '1.1.7'  # PIL version
-PILLOW_VERSION = '2.5.3'  # Pillow
+PILLOW_VERSION = '2.6.0'  # Pillow
 
 _plugins = ['BmpImagePlugin',
             'BufrStubImagePlugin',

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

Tests/test_imagedraw.py

@@ -63,8 +63,8 @@ class TestImageDraw(PillowTestCase):
         del draw
 
         # Assert
-        self.assert_image_equal(
+        self.assert_image_similar(
-            im, Image.open("Tests/images/imagedraw_arc.png"))
+            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(
+        self.assert_image_similar(
-            im, Image.open("Tests/images/imagedraw_chord.png"))
+            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(
+        self.assert_image_similar(
-            im, Image.open("Tests/images/imagedraw_ellipse.png"))
+            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(
+        self.assert_image_similar(
-            im, Image.open("Tests/images/imagedraw_pieslice.png"))
+            im, Image.open("Tests/images/imagedraw_pieslice.png"),1)
 
     def test_pieslice1(self):
         self.helper_pieslice(BBOX1)

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)
 

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
+        if 'rc' in PILLOW_VERSION:
-        self.assertEqual(rating, (10, []))
+            #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__':

_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"
 
 #include "Python.h"
 

setup.py

@@ -90,7 +90,7 @@ except (ImportError, OSError):
 
 
 NAME = 'Pillow'
-PILLOW_VERSION = '2.5.3'
+PILLOW_VERSION = '2.6.0'
 TCL_ROOT = None
 JPEG_ROOT = None
 JPEG2K_ROOT = None