[ARVADOS] created: 9a69e635b3b3754c44d01eb73b6bc7f2ea53cb84
Git user
git at public.curoverse.com
Wed Apr 6 22:47:44 EDT 2016
at 9a69e635b3b3754c44d01eb73b6bc7f2ea53cb84 (commit)
commit 9a69e635b3b3754c44d01eb73b6bc7f2ea53cb84
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Apr 6 22:26:41 2016 -0400
8904: Avoid installing pip >= 8 in a Python 3.2 virtualenv.
diff --git a/build/run-tests.sh b/build/run-tests.sh
index 041c7c2..de64b8c 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -384,7 +384,12 @@ setup_virtualenv() {
if ! [[ -e "$venvdest/bin/activate" ]] || ! [[ -e "$venvdest/bin/pip" ]]; then
virtualenv --setuptools "$@" "$venvdest" || fatal "virtualenv $venvdest failed"
fi
- "$venvdest/bin/pip" install 'setuptools>=18' 'pip>=7'
+ if [[ $("$venvdest/bin/python" --version 2>&1) =~ \ 3\.[012]\. ]]; then
+ # pip 8.0.0 dropped support for python 3.2, e.g., debian wheezy
+ "$venvdest/bin/pip" install 'setuptools>=18' 'pip>=7,<8'
+ else
+ "$venvdest/bin/pip" install 'setuptools>=18' 'pip>=7'
+ fi
# ubuntu1404 can't seem to install mock via tests_require, but it can do this.
"$venvdest/bin/pip" install 'mock>=1.0' 'pbr<1.7.0'
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list