diff options
| author | holger krekel <holger@merlinux.eu> | 2011-05-26 16:02:52 +0200 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2011-05-26 16:02:52 +0200 |
| commit | cdc4e63241dd0f286a7cec6f676a1e93dd82e262 (patch) | |
| tree | d11e191349e73650745a2a72b8f50cdbe8fc56d6 | |
| parent | 201268090ce7ed4ccf24e9346901904513de6bc8 (diff) | |
| parent | d3e73ca1f6b7edbd079f7430432c352e71dbdd59 (diff) | |
| download | tox-cdc4e63241dd0f286a7cec6f676a1e93dd82e262.tar.gz | |
merge Chris environment branch
| -rw-r--r-- | CHANGELOG.txt | 3 | ||||
| -rw-r--r-- | doc/conf.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 9f5c933..d42ae2c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,7 @@ 1.0.dev ----------------- - +- fix issue24: merge Chris Rose' new "environment" spec to allow + testenvs to specify environment variables - fix issue22: require virtualenv-1.6.1, obsoleting virtualenv5 (thanks Jannis Leidel) and making things work with pypy-1.5 and python3 more seemlessly - toxbootstrap.py (used by jenkins build slaves) now follows the latest release of virtualenv diff --git a/doc/conf.py b/doc/conf.py index 314ab5b..6459786 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -48,9 +48,9 @@ copyright = u'2010, holger krekel' # built documents. # # The short X.Y version. -version = '0.9' +version = '1.0' # The full version, including alpha/beta/rc tags. -release = '0.9' +release = '1.0.dev3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |