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 
Conflicts:
	static/style/blue/base.css
This commit is contained in:
Nicola Soranzo
2017-10-30 19:15:50 +00:00
parent c2f4b5ac8f be30d6824d
commit aacdf8d939
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/style/less/upload.less
+1 -1
View File
@@ -126,7 +126,7 @@
resize: none;
background: inherit;
color: @black;
white-space: nowrap;
white-space: pre;
overflow: scroll;
}
.upload-text-info {
config/local_conda_mapping.yml.sample
+1 -1
View File
@@ -1,2 +1,2 @@
# See $GALAXY_ROOT/lib/galaxy/tools/deps/default_conda_mapping.yml for example mapping -
# See $GALAXY_ROOT/lib/galaxy/tools/deps/resolvers/default_conda_mapping.yml for example mapping -
# additional site-specific mappings can be added to config/conda_mapping.yml.
lib/galaxy/dependencies/dev-requirements.txt
+1
View File
@@ -2,6 +2,7 @@
nose
NoseHTML
twill==0.9.1
testfixtures
mock
selenium
watchdog
lib/galaxy/dependencies/pinned-requirements.txt
-1
View File
@@ -32,7 +32,6 @@ nose==1.3.7
Parsley==1.3
six==1.10.0
Whoosh==2.7.4
testfixtures==4.10.0
galaxy_sequence_utils==1.0.2
h5py==2.7.1
scripts/common_startup.sh
+4 -3
View File
@@ -134,17 +134,18 @@ if [ $SET_VENV -eq 1 ]; then
fi
: ${GALAXY_WHEELS_INDEX_URL:="https://wheels.galaxyproject.org/simple"}
: ${PYPI_INDEX_URL:="https://pypi.python.org/simple"}
if [ $REPLACE_PIP -eq 1 ]; then
pip install 'pip>=8.1'
fi
if [ $FETCH_WHEELS -eq 1 ]; then
pip install -r requirements.txt --index-url "${GALAXY_WHEELS_INDEX_URL}" --extra-index-url https://pypi.python.org/pypi
pip install -r requirements.txt --index-url "${GALAXY_WHEELS_INDEX_URL}" --extra-index-url "${PYPI_INDEX_URL}"
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}" --extra-index-url https://pypi.python.org/pypi
[ -z "$GALAXY_CONDITIONAL_DEPENDENCIES" ] || echo "$GALAXY_CONDITIONAL_DEPENDENCIES" | pip install -r /dev/stdin --index-url "${GALAXY_WHEELS_INDEX_URL}" --extra-index-url "${PYPI_INDEX_URL}"
fi
if [ $FETCH_WHEELS -eq 1 -a $DEV_WHEELS -eq 1 ]; then
dev_requirements='./lib/galaxy/dependencies/dev-requirements.txt'
[ -f $dev_requirements ] && pip install -r $dev_requirements --index-url "${GALAXY_WHEELS_INDEX_URL}"
[ -f $dev_requirements ] && pip install -r $dev_requirements --index-url "${GALAXY_WHEELS_INDEX_URL}" --extra-index-url "${PYPI_INDEX_URL}"
fi
static/style/blue/base.css
+1 -1
View File
File diff suppressed because one or more lines are too long