opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_17.09' into dev

Browse Source
This commit is contained in:
Nicola Soranzo
2017-09-25 10:56:37 +01:00
parent 9e4259192d 3ae6318b02
commit 0c23d40b22
9 changed files with 94 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/common_startup.sh
+2 -2
View File
@@ -139,9 +139,9 @@ if [ $REPLACE_PIP -eq 1 ]; then
fi
if [ $FETCH_WHEELS -eq 1 ]; then
pip install -r requirements.txt --index-url "${GALAXY_WHEELS_INDEX_URL}"
pip install -r requirements.txt --index-url "${GALAXY_WHEELS_INDEX_URL}" --extra-index-url https://pypi.python.org/pypi
GALAXY_CONDITIONAL_DEPENDENCIES=$(PYTHONPATH=lib python -c "import galaxy.dependencies; print '\n'.join(galaxy.dependencies.optional('$GALAXY_CONFIG_FILE'))")
[ -z "$GALAXY_CONDITIONAL_DEPENDENCIES" ] || echo "$GALAXY_CONDITIONAL_DEPENDENCIES" | pip install -r /dev/stdin --index-url "${GALAXY_WHEELS_INDEX_URL}"
[ -z "$GALAXY_CONDITIONAL_DEPENDENCIES" ] || echo "$GALAXY_CONDITIONAL_DEPENDENCIES" | pip install -r /dev/stdin --index-url "${GALAXY_WHEELS_INDEX_URL}" --extra-index-url https://pypi.python.org/pypi
fi
if [ $FETCH_WHEELS -eq 1 -a $DEV_WHEELS -eq 1 ]; then