Commit 931c6dc3 authored by Richard Pospesel's avatar Richard Pospesel
Browse files

Bug 40042: setup-virtualenv attempts to install the wrong version of the distro package

parent 76fd8eba
......@@ -2,7 +2,7 @@
*.pyc
clones
virtualenv
virtualenv-marionette-4.3.0
virtualenv-marionette-*
reports
tmp
bundle
......@@ -46,6 +46,9 @@ unless (-d $virtenv_marionette_dir) {
# upgrade pip and setuptools
run("$virtenv_marionette_dir/$bin/pip", 'install', '--upgrade', 'pip');
run("$virtenv_marionette_dir/$bin/pip", 'install', '--upgrade', 'setuptools');
# for some reason setup.py tries to install distro version 1.7 which is not
# compatible with python2.7, so have pip resolve this dependency manually to 1.6
run("$virtenv_marionette_dir/$bin/pip", 'install', 'distro');
run_from_dir('marionette', "$virtenv_marionette_dir/$bin/python", 'setup.py', 'develop');
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment