Merge branch 'release_17.05' into release_17.09

galaxyproject · Oct 30, 2017 · be30d68 · be30d68
2 parents 1664a2c + 7688b05
commit be30d68
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/config/local_conda_mapping.yml.sample b/config/local_conda_mapping.yml.sample
@@ -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.
diff --git a/lib/galaxy/dependencies/dev-requirements.txt b/lib/galaxy/dependencies/dev-requirements.txt
@@ -2,6 +2,7 @@
 nose
 NoseHTML
 twill==0.9.1
+testfixtures
 mock
 selenium
 watchdog

diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt
@@ -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