Corrected alpha_composite args documentation

Release notes for 4.2.1

CHANGES.rst

@@ -1,7 +1,7 @@
 Changelog (Pillow)
 ==================
 
-4.2.1 (unreleased)
+4.2.1 (2017-07-06)
 ------------------
 
 - CI: Fix version specification and test on CI for PyPy/Windows #2608

PIL/Image.py

@@ -1069,7 +1069,7 @@ class Image(object):
         _decompression_bomb_check((x1, y1))
 
         return im.crop((x0, y0, x1, y1))
-         
+
     def draft(self, mode, size):
         """
         Configures the image file loader so it returns a version of the
@@ -1381,12 +1381,12 @@ class Image(object):
         onto this image.
 
         :param im: image to composite over this one
-        :param dest: Optional 2 tuple (top, left) specifying the upper
+        :param dest: Optional 2 tuple (left, top) specifying the upper
           left corner in this (destination) image.
-        :param source: Optional 2 (top, left) tuple for the upper left
+        :param source: Optional 2 (left, top) tuple for the upper left
-          corner in the overlay source image, or 4 tuple (top, left, bottom,
+          corner in the overlay source image, or 4 tuple (left, top, right,
-          right) for the bounds of the source rectangle
+          bottom) for the bounds of the source rectangle
-          
+
         Performance Note: Not currently implemented in-place in the core layer.
         """
 
@@ -1406,7 +1406,7 @@ class Image(object):
         if len(source) == 2:
             source = source + im.size
 
-        # over image, crop if it's not the whole thing. 
+        # over image, crop if it's not the whole thing.
         if source == (0,0) + im.size:
             overlay = im
         else:
@@ -1414,16 +1414,16 @@ class Image(object):
 
         # target for the paste
         box = dest + (dest[0] + overlay.width, dest[1] + overlay.height)
-            
+
         # destination image. don't copy if we're using the whole image.
         if dest == (0,0) + self.size:
             background = self
         else:
             background = self.crop(box)
-                        
+
         result = alpha_composite(background, overlay)
         self.paste(result, box)
-        
+
     def point(self, lut, mode=None):
         """
         Maps this image through a lookup table or function.

PIL/version.py

@@ -1,2 +1,2 @@
 # Master version for Pillow
-__version__ = '4.2.0'
+__version__ = '4.2.1'

docs/installation.rst

@@ -379,7 +379,7 @@ These platforms are built and tested for every change.
 +----------------------------------+-------------------------------+-----------------------+
 | Ubuntu Linux 12.04 LTS           | 2.7                           |x86-64                 |
 +----------------------------------+-------------------------------+-----------------------+
-| Windows Server 2012 R2           | 2.7,3.3,3.4                   |x86, x86-64            |
+| Windows Server 2012 R2           | 2.7,3.3,3.4,pypy              |x86, x86-64            |
 +----------------------------------+-------------------------------+-----------------------+
 
 \* Mac OS X CI is not run for every commit, but is run for every release.

docs/releasenotes/4.2.1.rst

@@ -0,0 +1,11 @@
+4.2.1
+-----
+
+There are no functional changes in this release.
+
+Fixed Windows PyPy Build
+========================
+
+A change in the 4.2.0 cycle broke the Windows PyPy build. This has
+been fixed, and PyPy is now part of the Windows CI matrix.
+

docs/releasenotes/index.rst

@@ -6,6 +6,7 @@ Release Notes
 .. toctree::
   :maxdepth: 2
 
+  4.2.1
   4.2.0
   4.1.1
   4.1.0