diff --git a/CHANGELOG b/CHANGELOG index 7c7db709f..128288357 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,7 +15,9 @@ unreleased travis builds. Thanks John Vandenberg. - fix #348: add py2 and py3 as default environments pointing to - "python2" and "python3" basepython executables. Thanks Tobias McNulty. + "python2" and "python3" basepython executables. Also fix #347 by + updating the list of default envs in the tox basic example. + Thanks Tobias McNulty. 2.4.1 diff --git a/doc/example/basic.txt b/doc/example/basic.txt index a8d074d25..5b0cf72f3 100644 --- a/doc/example/basic.txt +++ b/doc/example/basic.txt @@ -31,15 +31,15 @@ you can run restrict the test run to the python2.6 environment. Available "default" test environments names are:: py - py24 - py25 + py2 py26 py27 - py30 - py31 - py32 + py3 py33 py34 + py35 + py36 + py37 jython pypy pypy3