Skip to content

Commit

Permalink
--pre does not exist on pip < 1.4, but on pip < 1.4, the default
Browse files Browse the repository at this point in the history
behavior was the same as using --pre on pip >= 1.4. Therefore, detect
the version of pip and add --pre if necessary.

Fixes #1134
  • Loading branch information
natefoo committed Dec 18, 2015
1 parent cced5c3 commit 43e3841
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion scripts/common_startup.sh
Expand Up @@ -105,7 +105,9 @@ if [ $FETCH_WHEELS -eq 1 ]; then
# problems when there are conflicts with Galaxy's dependencies outside the
# venv (e.g. virtualenv-burrito's pip and six)
unset PYTHONPATH
pip install --pre --no-index --find-links ${GALAXY_WHEELS_INDEX_URL}/pip --upgrade pip
pip_version=`pip --version | awk '{print $2}'`
pre=`python -c "from pkg_resources import parse_version; from sys import stdout; stdout.write('--pre') if parse_version('$pip_version') >= parse_version('1.4') else stdout.write('')"`
pip install $pre --no-index --find-links ${GALAXY_WHEELS_INDEX_URL}/pip --upgrade pip
# binary-compatibility.cfg may need to be created (e.g. on CentOS)
[ ! -f ${VIRTUAL_ENV}/binary-compatibility.cfg ] && python ./scripts/binary_compatibility.py -o ${VIRTUAL_ENV}/binary-compatibility.cfg
pip install -r requirements.txt --index-url ${GALAXY_WHEELS_INDEX_URL}
Expand Down

0 comments on commit 43e3841

Please sign in to comment.