summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/index.txt2
-rw-r--r--tox.ini12
2 files changed, 5 insertions, 9 deletions
diff --git a/docs/index.txt b/docs/index.txt
index a1678fa..c085d27 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -47,7 +47,7 @@ Paste Deploy is released under the `MIT license
Status
------
-Paste Deploy has passed version 1.0. Paste Script is an actively
+Paste Deploy has passed version 1.0. Paste Deploy is an actively
maintained project. As of 1.0, we'll make a strong effort to maintain
backward compatibility (this actually started happening long before
1.0, but now it is explicit). This will include deprecation warnings
diff --git a/tox.ini b/tox.ini
index 4ac34fd..106434f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,14 +1,10 @@
[tox]
-envlist = py26,py27,py32,py33,pypy
+envlist = py26,py27,py32,py33,py34,pypy
[testenv]
-deps=nose
+deps=
+ nose
+ # Paste works on Python 3 since Paste 2.0
Paste
commands={envpython} setup.py test
-# Keep it this way until Paste has been ported to py3k
-[testenv:py32]
-deps=nose
-
-[testenv:py33]
-deps=nose