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.05' into release_17.09

Browse Source
This commit is contained in:
Nicola Soranzo
2017-10-30 18:51:32 +00:00
parent 1664a2c7e6 7688b057e6
commit be30d6824d
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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
@@ -31,7 +31,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