From 59e5b17ac704e1c45cf693187174225d3eefe994 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Wed, 4 Oct 2017 15:11:29 +0200 Subject: [PATCH 1/2] Fix path to example conda mapping --- config/local_conda_mapping.yml.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/local_conda_mapping.yml.sample b/config/local_conda_mapping.yml.sample index 383ce4836c6..4241ee78d7c 100644 --- 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. From aef5f4fa95c56362029dba6cf636103cf235fd13 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 26 Oct 2017 12:56:46 -0400 Subject: [PATCH 2/2] [16.10] Fix test fixtures dependency. It should have never been in the pinned requirements and has disappeared from PyPI. --- lib/galaxy/dependencies/dev-requirements.txt | 1 + lib/galaxy/dependencies/pinned-requirements.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/dependencies/dev-requirements.txt b/lib/galaxy/dependencies/dev-requirements.txt index 6e3a6df309b..b3f3022a173 100644 --- a/lib/galaxy/dependencies/dev-requirements.txt +++ b/lib/galaxy/dependencies/dev-requirements.txt @@ -1,4 +1,5 @@ nose NoseHTML twill==0.9.1 +testfixtures mock diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt index 3f79978d5f7..85522511006 100644 --- a/lib/galaxy/dependencies/pinned-requirements.txt +++ b/lib/galaxy/dependencies/pinned-requirements.txt @@ -29,7 +29,6 @@ nose==1.3.7 Parsley==1.3 six==1.9.0 Whoosh==2.7.4 -testfixtures==4.10.0 # Cheetah and dependencies Cheetah==2.4.4