[ARVADOS] updated: 10f81953efe1884f170a7a2be14e6f1c32012c86
Git user
git at public.curoverse.com
Fri Apr 8 10:12:38 EDT 2016
Summary of changes:
build/run-tests.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
via 10f81953efe1884f170a7a2be14e6f1c32012c86 (commit)
via 47c2e05d4d86206e15fdf7d14e6f00637dd81f94 (commit)
from a4f8073c3c8520bf0e12f335e2c829a7f7f43dd1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 10f81953efe1884f170a7a2be14e6f1c32012c86
Merge: a4f8073 47c2e05
Author: Brett Smith <brett at curoverse.com>
Date: Fri Apr 8 10:12:22 2016 -0400
Merge branch '8904-support-python3.2'
Closes #8904.
commit 47c2e05d4d86206e15fdf7d14e6f00637dd81f94
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