merge issue22 - use virtualenv-1.6, drop virtualenv5

8 files changed, 10 insertions, 8 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index edc6562..4b7dceb 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,12 +1,14 @@
-0.9.1
+0.9.1.dev
 -----------------
 
+- fix issue22: use virtualenv-1.6, obsoleting virtualenv5 (thanks Jannis Leidl)
 - require virtualenv-1.5.1 as to make pypy-1.4 work
 - fix issue14: report errors related to test command
 - fix issue20: document format of URLs for specifying dependencies
 - fix issue19: substitute Hudson for Jenkins everywhere following the renaming
   of the project.  NOTE: if you used the special [tox:jenkins]
   section it will now need to be named [tox:jenkins].
+- fix issue 23 / apply some ReST fixes
 
 0.9
 -----------------
diff --git a/doc/config.txt b/doc/config.txt
index 5187dc1..b725000 100644
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -234,7 +234,7 @@ test command, for example::
 
     tox -- --opt1 ARG1
 
-will make the `--opt1 ARG1`` appear in all test commands where ``[]`` was
+will make the ``--opt1 ARG1`` appear in all test commands where ``[]`` was
 specified.  By default (see ``args_are_paths`` setting), ``tox`` rewrites
 each positional argument if it is a relative path and exists on the
 filesystem to become a path relative to the ``changedir`` setting.
diff --git a/doc/example/general.txt b/doc/example/general.txt
index f0bb43d..c86c461 100644
--- a/doc/example/general.txt
+++ b/doc/example/general.txt
@@ -92,7 +92,7 @@ Access package artifacts between multiple tox-runs
 If you have multiple projects using tox you can make use of
 a ``distshare`` directory where ``tox`` will copy in sdist-packages so
 that another tox run can find the "latest" dependency.  This feature
-allows to to test a package against an unreleased development version
+allows to test a package against an unreleased development version
 or even an uncommitted version on your own machine.
 
 By default, ``{homedir}/.tox/distshare`` will be used for
diff --git a/doc/index.txt b/doc/index.txt
index e4a05b6..1b496db 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -61,7 +61,7 @@ Current features
 
     - installs your ``setup.py`` based project into each virtual environment
 
-    - test-tool agnostic: runs py.test, nose or unittests a uniform manner
+    - test-tool agnostic: runs py.test, nose or unittests in a uniform manner
 
 * supports :ref:`using different / multiple PyPI index servers  <multiindex>`
 
diff --git a/setup.py b/setup.py
index 806409d..f12ead2 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ def main():
         description='virtualenv-based automation of test activities',
         long_description=long_description,
         url='http://codespeak.net/tox',
-        version='0.9.1.dev3',
+        version='0.9.1.dev4',
         license='GPLv2 or later',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
         author='holger krekel',
diff --git a/tox.ini b/tox.ini
index c9322d6..069fb30 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ indexserver =
 
 [testenv]
 commands=py.test --junitxml={envlogdir}/junit-{envname}.xml []
-deps=:testrun:pytest
+deps=pytest
 
 [testenv:py27-xdist]
 commands=py.test -n5 --junitxml={envlogdir}/junit-{envname}.xml []
diff --git a/tox/__init__.py b/tox/__init__.py
index 1de44ba..7e18c15 100644
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
 #
-__version__ = '0.9.1.dev3'
+__version__ = '0.9.1.dev4'
 
 from py.apipkg import initpkg
 
diff --git a/toxbootstrap.py b/toxbootstrap.py
index a30692a..1392d44 100644
--- a/toxbootstrap.py
+++ b/toxbootstrap.py
@@ -58,7 +58,7 @@ ToDo
 
 """
 
-__version__ = '0.9.1.dev3'
+__version__ = '0.9.1.dev4'
 
 import sys
 import os