summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2012-12-22 22:25:18 +0100
committerholger krekel <holger@merlinux.eu>2012-12-22 22:25:18 +0100
commit15ae701422add202b1f064fb42270ab45c12e853 (patch)
tree1bf67030a89e74600e3138a212d7d54d250aab4a
parent4b4b36bdbd02ad0620ec04ac64a4758260cb26f9 (diff)
downloadtox-15ae701422add202b1f064fb42270ab45c12e853.tar.gz
some typo changes along with twittering, posting to TIP
-rw-r--r--doc/config-v2.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/config-v2.txt b/doc/config-v2.txt
index 4c803d2..431962d 100644
--- a/doc/config-v2.txt
+++ b/doc/config-v2.txt
@@ -5,7 +5,9 @@ V2: new tox multi-dimensional, platform-specific configuration
This is a draft document sketching a to-be-done implementation.
It does not fully specify each change yet but should give a good
- idea of where things are heading.
+ idea of where things are heading. For feedback, mail the
+ testing-in-python mailing list or open a pull request on
+ https://bitbucket.org/hpk42/tox/src/84d8cf3c2a95fefd874f22c8b2d257e94365472f/doc/config-v2.txt?at=default
**Abstract**: Adding multi-dimensional configuration, platform-specification
and multiple installers to tox.ini.
@@ -49,7 +51,7 @@ This document discusses a possible solution for each of these issues,
namely these goals:
- allow to more easily define and run dependency/interpreter variants
- with testenvs, maintaining per-testenv customizability
+ with testenvs
- allow platform-specific settings
- allow to specify platforms against which tests should run
- allow to run installer-variants (easy_install or pip)
@@ -110,7 +112,7 @@ eight different ``[testenv:...]`` sections::
mypkg14: mypkg>=1.4,<1.5
This defines an unconditional dependency ``pytest`` which is going to be
-installed in all environments. It also define two conditional deps:
+installed in all environments. It also defines two conditional dependencies:
- if ``mypkg13`` is part of the environment name, the ``mypkg<1.4`` spec
will be used, otherwise the line is empty.