diff options
| author | holger krekel <holger@merlinux.eu> | 2011-03-21 16:12:57 +0100 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2011-03-21 16:12:57 +0100 |
| commit | d47cbc2ad35302ff3c03198014d864a1c1fd6d43 (patch) | |
| tree | 01ffe74741e30ab183356ae87742ddf16b105b10 | |
| parent | d07df9236220736f69585eab115c6dd05b13ae28 (diff) | |
| download | tox-d47cbc2ad35302ff3c03198014d864a1c1fd6d43.tar.gz | |
fix issue 20 - document development URLs for deps
| -rw-r--r-- | CHANGELOG.txt | 2 | ||||
| -rw-r--r-- | doc/config.txt | 9 | ||||
| -rw-r--r-- | doc/example/basic.txt | 1 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | tox/__init__.py | 2 | ||||
| -rw-r--r-- | toxbootstrap.py | 2 |
6 files changed, 15 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index bb6d0f8..2115bdc 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -2,6 +2,8 @@ ----------------- - require virtualenv-1.5.1 as to make pypy-1.4 work +- fix issue14: report errors related to test command +- fix issue20: document format of URLs for specifying dependencies 0.9 ----------------- diff --git a/doc/config.txt b/doc/config.txt index 10d1da5..4fdbb7f 100644 --- a/doc/config.txt +++ b/doc/config.txt @@ -110,6 +110,15 @@ Complete list of settings that you can put into ``testenv*`` sections: deps = :myindex:pkg + If you want to use URLs to install development versions + of a Python package you can use the ``+`` forms, for example:: + + svn+http://code.djangoproject.com/svn/django/trunk/ + git+git://github.com/django/django.git + + (You cannot use the ``#`` character because that would + be regarded as a comment in the configuration file.) + .. confval:: recreate=True|False(default) diff --git a/doc/example/basic.txt b/doc/example/basic.txt index 3ceeb87..9bf0b68 100644 --- a/doc/example/basic.txt +++ b/doc/example/basic.txt @@ -103,3 +103,4 @@ To for tox to recreate a (particular) virtual environment:: would trigger a complete reinstallation of the existing py27 environment (or create it afresh if it doesn't exist). + @@ -35,7 +35,7 @@ def main(): description='virtualenv-based automation of test activities', long_description=long_description, url='http://codespeak.net/tox', - version='0.9.1.dev1', + version='0.9.1.dev2', license='GPLv2 or later', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], author='holger krekel', diff --git a/tox/__init__.py b/tox/__init__.py index ce9dfc3..c29b430 100644 --- a/tox/__init__.py +++ b/tox/__init__.py @@ -1,5 +1,5 @@ # -__version__ = '0.9.1.dev1' +__version__ = '0.9.1.dev2' from py.apipkg import initpkg diff --git a/toxbootstrap.py b/toxbootstrap.py index e2d4ab0..ccb4e6a 100644 --- a/toxbootstrap.py +++ b/toxbootstrap.py @@ -61,7 +61,7 @@ ToDo """ -__version__ = '0.9.1.dev1' +__version__ = '0.9.1.dev2' import sys import os |