Skip to content

Commit

Permalink
Merge pull request #1583 from nicoddemus/fix-tox-doctesting
Browse files Browse the repository at this point in the history
Use same python which invoked tox for "doctesting" env
  • Loading branch information
RonnyPfannschmidt committed Jun 2, 2016
2 parents 63ced4d + 2c4b76b commit 9b6dc93
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ but here is a simple overview:
You need to have Python 2.7 and 3.5 available in your system. Now
running tests is as simple as issuing this command::

$ python runtox.py -e linting,py27,py35
$ python3 runtox.py -e linting,py27,py35

This command will run tests via the "tox" tool against Python 2.7 and 3.5
and also perform "lint" coding-style checks. ``runtox.py`` is
Expand All @@ -226,11 +226,11 @@ but here is a simple overview:
To run tests on py27 and pass options to pytest (e.g. enter pdb on failure)
to pytest you can do::

$ python runtox.py -e py27 -- --pdb
$ python3 runtox.py -e py27 -- --pdb

or to only run tests in a particular test module on py35::

$ python runtox.py -e py35 -- testing/test_config.py
$ python3 runtox.py -e py35 -- testing/test_config.py

#. Commit and push once your tests pass and you are happy with your change(s)::

Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ commands=
make html

[testenv:doctesting]
basepython = python3
basepython = python
changedir=doc/en
deps=PyYAML
commands= py.test -rfsxX {posargs}
Expand Down

0 comments on commit 9b6dc93

Please sign in to comment.