From 2c4b76b7542449e29531ba291174fdb3383d4c86 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Wed, 1 Jun 2016 20:29:55 -0300 Subject: [PATCH] Use same python which invoked tox for "doctesting" env This will work for Travis and AppVeyor because both start tox using Python 3 --- CONTRIBUTING.rst | 6 +++--- tox.ini | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 75ee3ec32..5a00c191b 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -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 @@ -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):: diff --git a/tox.ini b/tox.ini index 5cf6e5133..e3922959e 100644 --- a/tox.ini +++ b/tox.ini @@ -100,7 +100,7 @@ commands= make html [testenv:doctesting] -basepython = python3 +basepython = python changedir=doc/en deps=PyYAML commands= py.test -rfsxX {posargs}