diff options
| author | holger krekel <holger@merlinux.eu> | 2010-07-08 19:30:53 +0200 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2010-07-08 19:30:53 +0200 |
| commit | 2727fb56f936cf98f5cd14fb2201ddfa8bd0a078 (patch) | |
| tree | 2f9bac8b5920a820aaf27c036a0480a2001e11d7 /doc | |
| parent | 04da112d36016febe7f0803fd07ddc754963393d (diff) | |
| download | tox-2727fb56f936cf98f5cd14fb2201ddfa8bd0a078.tar.gz | |
fix and refine executable finding and documentation
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/config.txt | 2 | ||||
| -rw-r--r-- | doc/example/general.txt | 2 | ||||
| -rw-r--r-- | doc/example/nose.txt | 6 | ||||
| -rw-r--r-- | doc/index.txt | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/doc/config.txt b/doc/config.txt index efef8bf..9adab30 100644 --- a/doc/config.txt +++ b/doc/config.txt @@ -16,7 +16,7 @@ List of optional global options:: [tox] toxworkdir=path # tox working directory, defaults to {toxinidir}/.tox setupdir=path # defaults to {toxinidir} - distdir=path # defaults to {toxworkdir}/dist + distdir=path # defaults to {toxworkdir}/dist distshare=path # defaults to {distdir} envlist=ENVLIST # defaults to the list of all environments diff --git a/doc/example/general.txt b/doc/example/general.txt index ebdd443..589782f 100644 --- a/doc/example/general.txt +++ b/doc/example/general.txt @@ -25,6 +25,8 @@ the above ``tox`` invocation will trigger the test runners to stop after the first failure and to only run a particular test file. +.. _`sphinx checks`: + Integrating "sphinx" documentation checks ---------------------------------------------- diff --git a/doc/example/nose.txt b/doc/example/nose.txt index a1d81e3..81a045b 100644 --- a/doc/example/nose.txt +++ b/doc/example/nose.txt @@ -35,9 +35,9 @@ then run the specified test command. More examples? ------------------------------------------ -Analogous to :doc:`pytest` it should be very easy to define additional options -and to integrate nosetest runs with Hudson. You are welcome to submit some -advanced tips and tricks for nose/tox interaction. +You can use and combine other features of ``tox`` with your tox runs, +e.g. :ref:`sphinx checks`. If you figure out something related to nose/tox +interactions you are welcome to submit some advanced tips and tricks. Also checkout :doc:`general`. diff --git a/doc/index.txt b/doc/index.txt index 605e016..de20202 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -23,7 +23,8 @@ Current features * uses pip_ (for Python2 environments) and distribute_ (for all environments) by default -* **cross-Python compatible**: Python2.4 up to Python3.1, Jython (and pypy-c, needs patches) +* **cross-Python compatible**: Python2.4 up to Python2.7, Jython and experimental + Python3 support as well as for pypy-c (which needs patches) * **cross-platform**: Windows and Unix style environments |