diff options
| author | holger krekel <holger@merlinux.eu> | 2014-03-24 13:27:39 +0100 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2014-03-24 13:27:39 +0100 |
| commit | d36aa0c35ff63963a5b5866e5039305ddf2954ae (patch) | |
| tree | 9faa18dd2feb97fc85f71dc70f1056da4a8703fa | |
| parent | 54c799bf122a5db7214024975aeb40c1ec533aca (diff) | |
| download | tox-d36aa0c35ff63963a5b5866e5039305ddf2954ae.tar.gz | |
fix issue162: don't list python 2.5 as compatibiliy/supported
| -rwxr-xr-x | CHANGELOG | 5 | ||||
| -rw-r--r-- | doc/config.txt | 8 | ||||
| -rw-r--r-- | doc/index.txt | 5 | ||||
| -rw-r--r-- | doc/install.txt | 2 |
4 files changed, 8 insertions, 12 deletions
@@ -1,3 +1,8 @@ +XXX +--------- + +- fix issue162: don't list python 2.5 as compatibiliy/supported + 1.7.0 --------- diff --git a/doc/config.txt b/doc/config.txt index 34b88af..28068a3 100644 --- a/doc/config.txt +++ b/doc/config.txt @@ -97,14 +97,6 @@ Complete list of settings that you can put into ``testenv*`` sections: pip install --pre {opts} {packages} - **default on environments using python2.5**:: - - pip install {opts} {packages}`` - - this will use pip<1.4 which has no ``--pre`` option. Note also - that for python2.5 support you may need to install ssl and/or - use ``setenv = PIP_INSECURE=1`` in a py25 based testenv. - .. confval:: whitelist_externals=MULTI-LINE-LIST each line specifies a command name (in glob-style pattern format) diff --git a/doc/index.txt b/doc/index.txt index 7fcc310..c1baae2 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -68,9 +68,8 @@ Current features support for configuring the installer command through :confval:`install_command=ARGV`. -* **cross-Python compatible**: Python-2.5 up to Python-3.3, - Jython and pypy_ support. Python-2.5 is supported through - a vendored ``virtualenv-1.9.1`` script. +* **cross-Python compatible**: Python-2.6 up to Python-3.3, + Jython and pypy_ support. * **cross-platform**: Windows and Unix style environments diff --git a/doc/install.txt b/doc/install.txt index 5914ac1..2851571 100644 --- a/doc/install.txt +++ b/doc/install.txt @@ -4,7 +4,7 @@ tox installation Install info in a nutshell ---------------------------------- -**Pythons**: CPython 2.4-3.3, Jython-2.5.1, pypy-1.9ff +**Pythons**: CPython 2.6-3.3, Jython-2.5.1, pypy-1.9ff **Operating systems**: Linux, Windows, OSX, Unix |
