Update the versions we support

5 files changed, 9 insertions, 13 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 2812c1e1..26bd45cb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,7 +5,8 @@ Change history for Coverage.py
 4.0
 ---
 
-- Python versions supported are now 2.6, 2.7, 3.2, 3.3.
+- Python versions supported are now CPython 2.6, 2.7, 3.2, 3.3, and 3.4, and
+  PyPy 2.2.
 
 - The XML report now contains a <source> element, fixing `issue 94`_.  Thanks
   Stan Hu.
diff --git a/howto.txt b/howto.txt
index b5432535..3367a063 100644
--- a/howto.txt
+++ b/howto.txt
@@ -4,7 +4,7 @@
     - Windows
     - Ubuntu
     - Mac
-    - Pythons 2.3, 2.4, 2.5, 2.6, 2.7, 3.1, 3.2, 3.3
+    - Pythons 2.6, 2.7, 3.2, 3.3, 3.4
 - Version number in coverage/version.py
     - 3.1a1, 3.1b1, 3.1c1, 3.1
 - Update CHANGES.txt, including release date.
diff --git a/metacov.ini b/metacov.ini
index 75bd9d2d..57285d6f 100644
--- a/metacov.ini
+++ b/metacov.ini
@@ -6,19 +6,17 @@ parallel = true
 source =
     $COVERAGE_HOME/coverage
     $COVERAGE_HOME/tests
-    $COVERAGE_HOME/.tox/py25/lib/python2.5/site-packages/coverage
     $COVERAGE_HOME/.tox/py26/lib/python2.6/site-packages/coverage
     $COVERAGE_HOME/.tox/py27/lib/python2.7/site-packages/coverage
-    $COVERAGE_HOME/.tox/py31/lib/python3.1/site-packages/coverage
     $COVERAGE_HOME/.tox/py32/lib/python3.2/site-packages/coverage
     $COVERAGE_HOME/.tox/py33/lib/python3.3/site-packages/coverage
+    $COVERAGE_HOME/.tox/py34/lib/python3.4/site-packages/coverage
     $COVERAGE_HOME/.tox/pypy/site-packages/coverage
-    $COVERAGE_HOME\.tox\py25\Lib\site-packages\coverage
     $COVERAGE_HOME\.tox\py26\Lib\site-packages\coverage
     $COVERAGE_HOME\.tox\py27\Lib\site-packages\coverage
-    $COVERAGE_HOME\.tox\py31\Lib\site-packages\coverage
     $COVERAGE_HOME\.tox\py32\Lib\site-packages\coverage
     $COVERAGE_HOME\.tox\py33\Lib\site-packages\coverage
+    $COVERAGE_HOME\.tox\py34\Lib\site-packages\coverage
 
 [report]
 # We set a different pragma so our code won't be confused with test code.
@@ -39,17 +37,14 @@ precision = 1
 [paths]
 source =
     /home/ned/coverage/trunk
-    /home/ned/coverage/trunk/.tox/py25/lib/python2.5/site-packages
     /home/ned/coverage/trunk/.tox/py26/lib/python2.6/site-packages
     /home/ned/coverage/trunk/.tox/py27/lib/python2.7/site-packages
-    /home/ned/coverage/trunk/.tox/py31/lib/python3.1/site-packages
     /home/ned/coverage/trunk/.tox/py32/lib/python3.2/site-packages
     /home/ned/coverage/trunk/.tox/py33/lib/python3.3/site-packages
+    /home/ned/coverage/trunk/.tox/py34/lib/python3.4/site-packages
     /home/ned/coverage/trunk/.tox/pypy/site-packages
     C:\ned\coverage\trunk
-    C:\ned\coverage\trunk\.tox\py25\Lib\site-packages
     C:\ned\coverage\trunk\.tox\py26\Lib\site-packages
     C:\ned\coverage\trunk\.tox\py27\Lib\site-packages
-    C:\ned\coverage\trunk\.tox\py31\Lib\site-packages
     C:\ned\coverage\trunk\.tox\py32\Lib\site-packages
-    C:\ned\coverage\trunk\.tox\py33\Lib\site-packages
+    C:\ned\coverage\trunk\.tox\py34\Lib\site-packages
diff --git a/setup.py b/setup.py
index e8780f3a..52eb086f 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ Coverage.py measures code coverage, typically during test execution. It uses
 the code analysis tools and tracing hooks provided in the Python standard
 library to determine which lines are executable, and which have been executed.
 
-Coverage.py runs on Pythons 2.6, 2.7, 3.2, 3.3, and PyPy 1.9.
+Coverage.py runs on CPython 2.6, 2.7, 3.2, 3.3, or 3.4, and PyPy 2.2.
 
 Documentation is at `nedbatchelder.com <%s>`_.  Code repository and issue
 tracker are on `Bitbucket <http://bitbucket.org/ned/coveragepy>`_, with a
diff --git a/tox.ini b/tox.ini
index e5984660..1d6050aa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py32, py33, pypy
+envlist = py26, py27, py32, py33, py34, pypy
 
 [testenv]
 commands =