Paperwork for version 4.2

6 files changed, 81 insertions, 6 deletions

diff --git a/CHANGES.rst b/CHANGES.rst
index 66dc649..c9f5677 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,8 +5,8 @@
 Change history for Coverage.py
 ==============================
 
-Unreleased
-----------
+Version 4.2 --- 2016-07-26
+--------------------------
 
 - Since ``concurrency=multiprocessing`` uses subprocesses, options specified on
   the coverage.py command line will not be communicated down to them.  Only
diff --git a/coverage/version.py b/coverage/version.py
index 19aa457..4ebdc53 100644
--- a/coverage/version.py
+++ b/coverage/version.py
@@ -5,7 +5,7 @@
 # This file is exec'ed in setup.py, don't import anything!
 
 # Same semantics as sys.version_info.
-version_info = (4, 2, 0, 'beta', 2)
+version_info = (4, 2, 0, 'final', 0)
 
 
 def _make_version(major, minor, micro, releaselevel, serial):
diff --git a/doc/changes.rst b/doc/changes.rst
index 9e28b2b..6bb2cb2 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -49,6 +49,80 @@ history, see the `CHANGES.rst`_ file in the source tree.
 
 .. module:: coverage
 
+.. _changes_42:
+
+Version 4.2 --- 2016-07-26
+--------------------------
+
+Work from the PyCon 2016 Sprints!
+
+- BACKWARD INCOMPATIBILITY: the ``coverage combine`` command now ignores an
+  existing ``.coverage`` data file.  It used to include that file in its
+  combining.  This caused confusing results, and extra tox "clean" steps.  If
+  you want the old behavior, use the new ``coverage combine --append`` option.
+
+- Since ``concurrency=multiprocessing`` uses subprocesses, options specified on
+  the coverage.py command line will not be communicated down to them.  Only
+  options in the configuration file will apply to the subprocesses.
+  Previously, the options didn't apply to the subprocesses, but there was no
+  indication.  Now it is an error to use ``--concurrency=multiprocessing`` and
+  other run-affecting options on the command line.  This prevents
+  failures like those reported in `issue 495`_.
+
+- The ``concurrency`` option can now take multiple values, to support programs
+  using multiprocessing and another library such as eventlet.  This is only
+  possible in the configuration file, not from the command line. The
+  configuration file is the only way for sub-processes to all run with the same
+  options.  Fixes `issue 484`_.  Thanks to Josh Williams for prototyping.
+
+- Using a ``concurrency`` setting of ``multiprocessing`` now implies
+  ``--parallel`` so that the main program is measured similarly to the
+  sub-processes.
+
+- When using `automatic subprocess measurement`_, running coverage commands
+  would create spurious data files.  This is now fixed, thanks to diagnosis and
+  testing by Dan Riti.  Closes `issue 492`_.
+
+- A new configuration option, ``report:sort``, controls what column of the
+  text report is used to sort the rows.  Thanks to Dan Wandschneider, this
+  closes `issue 199`_.
+
+- The HTML report has a more-visible indicator for which column is being
+  sorted.  Closes `issue 298`_, thanks to Josh Williams.
+
+- Filtering the HTML report is now faster, thanks to Ville Skyttä.
+
+- If the HTML report cannot find the source for a file, the message now
+  suggests using the ``-i`` flag to allow the report to continue. Closes
+  `issue 231`_, thanks, Nathan Land.
+
+- When reports are ignoring errors, there's now a warning if a file cannot be
+  parsed, rather than being silently ignored.  Closes `issue 396`_. Thanks,
+  Matthew Boehm.
+
+- A new option for ``coverage debug`` is available: ``coverage debug config``
+  shows the current configuration.  Closes `issue 454`_, thanks to Matthew
+  Boehm.
+
+- Running coverage as a module (``python -m coverage``) no longer shows the
+  program name as ``__main__.py``.  Fixes `issue 478`_.  Thanks, Scott Belden.
+
+- The `test_helpers` module has been moved into a separate pip-installable
+  package: `unittest-mixins`_.
+
+.. _automatic subprocess measurement: http://coverage.readthedocs.io/en/latest/subprocess.html
+.. _issue 199: https://bitbucket.org/ned/coveragepy/issues/199/add-a-way-to-sort-the-text-report
+.. _issue 231: https://bitbucket.org/ned/coveragepy/issues/231/various-default-behavior-in-report-phase
+.. _issue 298: https://bitbucket.org/ned/coveragepy/issues/298/show-in-html-report-that-the-columns-are
+.. _issue 396: https://bitbucket.org/ned/coveragepy/issues/396/coverage-xml-shouldnt-bail-out-on-parse
+.. _issue 454: https://bitbucket.org/ned/coveragepy/issues/454/coverage-debug-config-should-be
+.. _issue 478: https://bitbucket.org/ned/coveragepy/issues/478/help-shows-silly-program-name-when-running
+.. _issue 484: https://bitbucket.org/ned/coveragepy/issues/484/multiprocessing-greenlet-concurrency
+.. _issue 492: https://bitbucket.org/ned/coveragepy/issues/492/subprocess-coverage-strange-detection-of
+.. _issue 495: https://bitbucket.org/ned/coveragepy/issues/495/branch-and-concurrency-are-conflicting
+.. _unittest-mixins: https://pypi.python.org/pypi/unittest-mixins
+
+
 .. _changes_41:
 
 Version 4.1 --- 2016-05-21
diff --git a/doc/conf.py b/doc/conf.py
index 5380341..684628d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -58,7 +58,7 @@ copyright = u'2009\N{EN DASH}2016, Ned Batchelder'
 # The short X.Y version.
 version = '4.2'
 # The full version, including alpha/beta/rc tags.
-release = '4.2b1'
+release = '4.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/index.rst b/doc/index.rst
index db2e362..47d6440 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -47,6 +47,7 @@ Coverage.py
 .. :history: 20160123T171300, updated for 4.1b2
 .. :history: 20160510T125300, updated for 4.1b3
 .. :history: 20160521T074500, udpated for 4.1
+.. :history: 20160726T161300, udpated for 4.2
 
 
 Coverage.py is a tool for measuring code coverage of Python programs. It
@@ -59,7 +60,7 @@ not.
 
 .. ifconfig:: not prerelease
 
-    The latest version is coverage.py 4.1, released May 21st 2016.  It
+    The latest version is coverage.py 4.2, released July 26th 2016.  It
     is supported on:
 
     * Python versions 2.6, 2.7, 3.3, 3.4, 3.5, and 3.6.
diff --git a/howto.txt b/howto.txt
index 3aa526f..c8179cd 100644
--- a/howto.txt
+++ b/howto.txt
@@ -17,7 +17,7 @@ pip install -r requirements/dev.pip
 - Update README.rst, including "New in x.y:"
 - Update docs
     - Version, date, and changes in doc/changes.rst
-    - Version and date in doc/index.rst
+    - Version, date and python versions in doc/index.rst
     - Version and copyright date in doc/conf.py
     - Don't forget the man page: doc/python-coverage.1.txt
     - Check that the docs build correctly: