aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/developer-guide.txt3
-rw-r--r--tox.ini6
2 files changed, 4 insertions, 5 deletions
diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index b6f5bb9f..ae33649b 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -94,7 +94,8 @@ The primary tests are run using py.test. To run the tests::
$ python setup.py test
-Or install py.test into your environment and run ``py.test``.
+Or install py.test into your environment and run ``PYTHONPATH=. py.test``
+or ``python -m pytest``.
Under continuous integration, additional tests may be run. See the
``.travis.yml`` file for full details on the tests run under Travis-CI.
diff --git a/tox.ini b/tox.ini
index 7aeffdd8..9061869f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,5 @@
[tox]
envlist = py26,py27,py31,py32,py33,py34
+
[testenv]
-deps=
- pytest
- mock
-commands=py.test setuptools {posargs}
+commands=python setup.py test