diff options
| author | holger krekel <holger@merlinux.eu> | 2011-07-07 19:45:46 +0200 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2011-07-07 19:45:46 +0200 |
| commit | b66e002dad31afd9cc02bee3ada99ada9bd08ca0 (patch) | |
| tree | 0eabbe55d74de934169a6f7cf707766953b16b58 | |
| parent | 0a18cba4d5324056846d2b3e8ad0a2a04f56543f (diff) | |
| download | tox-b66e002dad31afd9cc02bee3ada99ada9bd08ca0.tar.gz | |
don't assume virtualenv is installed as a dependency when tox is installed
(which now inlines virtualenv.py)
| -rw-r--r-- | toxbootstrap.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/toxbootstrap.py b/toxbootstrap.py index 68536a4..e869ae9 100644 --- a/toxbootstrap.py +++ b/toxbootstrap.py @@ -226,16 +226,16 @@ def cmdline(argv=None): tox_script = path.abspath(get_script_path(TENV, 'tox')) logging.info('tox is installed at %s version %s', tox_script, toxversion) - virtualenv = get_script_path(TENV, 'virtualenv') - venv_version = crun('%s --version' % (virtualenv,)).strip() - logging.info('virtualenv at %s version %s', virtualenv, venv_version) + #virtualenv = get_script_path(TENV, 'virtualenv') + #venv_version = crun('%s --version' % (virtualenv,)).strip() + #logging.info('virtualenv at %s version %s', virtualenv, venv_version) # XXX: virtualenv 1.5 is broken; replace it - if venv_version == '1.5': - logging.info( - 'Replacing the unstable virtualenv-1.5 with the latest stable') - run('%s uninstall -y virtualenv' % (pip,)) - run('%s install virtualenv!=1.5' % (pip,)) + #if venv_version == '1.5': + # logging.info( + # 'Replacing the unstable virtualenv-1.5 with the latest stable') + # run('%s uninstall -y virtualenv' % (pip,)) + # run('%s install virtualenv!=1.5' % (pip,)) # Now run the locally-installed tox os.chdir(currentdir) |