diff options
| author | holger krekel <holger@merlinux.eu> | 2015-12-07 14:06:51 +0100 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2015-12-07 14:06:51 +0100 |
| commit | 67250010a66cbc1b53181ab30bff3848c4519a59 (patch) | |
| tree | 7f0ce561f5b37a648ed77ef7e9ebf4632c773de2 | |
| parent | e4c19242837bfb6d6ba1486122c5b44d418e0ea2 (diff) | |
| parent | ff6898ab59957d96486b5b5ed33261eefc4b9fc4 (diff) | |
| download | tox-67250010a66cbc1b53181ab30bff3848c4519a59.tar.gz | |
merge
| -rw-r--r-- | doc/config.txt | 4 | ||||
| -rw-r--r-- | doc/example/basic.txt | 3 | ||||
| -rw-r--r-- | tox/session.py | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/doc/config.txt b/doc/config.txt index 8bfa57d..22f3dc7 100644 --- a/doc/config.txt +++ b/doc/config.txt @@ -441,7 +441,7 @@ Values from other sections can be refered to via:: {[sectionname]valuename} which you can use to avoid repetition of config values. -You can put default values in one section and reference them in others to avoid repeting the same values:: +You can put default values in one section and reference them in others to avoid repeating the same values:: [base] deps = @@ -455,7 +455,7 @@ You can put default values in one section and reference them in others to avoid {[base]deps} [testenv:mercurial] - dep = + deps = mercurial {[base]deps} diff --git a/doc/example/basic.txt b/doc/example/basic.txt index d0ad004..64150f3 100644 --- a/doc/example/basic.txt +++ b/doc/example/basic.txt @@ -30,6 +30,7 @@ you can run restrict the test run to the python2.6 environment. Available "default" test environments names are:: + py py24 py25 py26 @@ -43,6 +44,8 @@ Available "default" test environments names are:: pypy pypy3 +The environment ``py`` uses the version of Python used to invoke tox. + However, you can also create your own test environment names, see some of the examples in :doc:`examples <../examples>`. diff --git a/tox/session.py b/tox/session.py index f4214cf..6b82ccd 100644 --- a/tox/session.py +++ b/tox/session.py @@ -51,7 +51,7 @@ def show_help(config): "(overridable by '-e')") tw.line("TOX_TESTENV_PASSENV: space-separated list of extra " "environment variables to be passed into test command " - "environemnts") + "environments") def show_help_ini(config): |