diff options
| author | holger krekel <holger@merlinux.eu> | 2010-10-20 20:47:44 +0200 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2010-10-20 20:47:44 +0200 |
| commit | f9ec501e5c5f4f67978d69430792ac2b9dabc2e0 (patch) | |
| tree | b64beb60cda076d1d13f545df86fed7c352c9a8a | |
| parent | e3516c1621a08a6d31ab922c4bcbeb74463b455e (diff) | |
| download | tox-f9ec501e5c5f4f67978d69430792ac2b9dabc2e0.tar.gz | |
use pypi.testrun.org development versions if USETOXDEV is set, modify tox.ini to use testrun.org by default
| -rw-r--r-- | tox.ini | 5 | ||||
| -rw-r--r-- | toxbootstrap.py | 9 |
2 files changed, 10 insertions, 4 deletions
@@ -1,12 +1,11 @@ [tox] envlist=py27,py26,py25,py24,py31,docs indexserver= - dev http://pypi.testrun.org + default http://pypi.testrun.org [testenv] commands=py.test --junitxml={envlogdir}/junit-{envname}.xml [] -deps= - dev pytest +deps=pytest [testenv:docs] basepython=python diff --git a/toxbootstrap.py b/toxbootstrap.py index 59264a0..e8f5aea 100644 --- a/toxbootstrap.py +++ b/toxbootstrap.py @@ -61,6 +61,8 @@ ToDo """ +__version__ = "0.2" + import sys import os from os import path @@ -68,6 +70,8 @@ import logging from subprocess import Popen, PIPE, check_call, CalledProcessError +USETOXDEV=os.environ.get('USETOXDEV', False) + PY3 = sys.version_info[0] == 3 if PY3: @@ -184,7 +188,10 @@ def cmdline(argv=None): pip = get_script_path('toxinstall', 'pip') # install/upgrade tox itself - if any([ + if USETOXDEV: + run('%s install -i http://pypi.testrun.org ' + '--upgrade --download-cache=pip-cache tox' % (pip,)) + elif any([ not has_script('toxinstall', 'tox'), get_tox_version('toxinstall') != pypi_get_latest_version('tox')]): run('%s install --upgrade --download-cache=pip-cache tox' % (pip,)) |