This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch master in repository tor-browser-bundle-testsuite.

The following commit(s) were added to refs/heads/master by this push: new 931c6dc Bug 40042: setup-virtualenv attempts to install the wrong version of the distro package 931c6dc is described below

commit 931c6dc31d96f850383b6e6113795999d3420853 Author: Richard Pospesel richard@torproject.org AuthorDate: Thu Mar 31 20:23:22 2022 +0000

Bug 40042: setup-virtualenv attempts to install the wrong version of the distro package --- .gitignore | 2 +- setup-virtualenv | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore index 0e386d9..60be2a3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ *.pyc clones virtualenv -virtualenv-marionette-4.3.0 +virtualenv-marionette-* reports tmp bundle diff --git a/setup-virtualenv b/setup-virtualenv index 9641ee1..597e4b5 100755 --- a/setup-virtualenv +++ b/setup-virtualenv @@ -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'); }