diff --git a/CHANGES.rst b/CHANGES.rst index 7f3cb0f7f..9daff9d56 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -10,7 +10,7 @@ Changelog (Pillow) - PDF: Renamed parameter to not shadow built-in dict #2612 [kijeong] -4.2.1 (unreleased) +4.2.1 (2017-07-06) ------------------ - CI: Fix version specification and test on CI for PyPy/Windows #2608 diff --git a/docs/installation.rst b/docs/installation.rst index 3f634632a..f7834c495 100644 --- a/docs/installation.rst +++ b/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. diff --git a/docs/releasenotes/4.2.1.rst b/docs/releasenotes/4.2.1.rst new file mode 100644 index 000000000..c9e953da4 --- /dev/null +++ b/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. + diff --git a/docs/releasenotes/index.rst b/docs/releasenotes/index.rst index 624c727a9..27b12face 100644 --- a/docs/releasenotes/index.rst +++ b/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