Merge branch 'release_17.09' into release_18.01

Conflicts: lib/galaxy/tools/__init__.py
galaxyproject · Mar 1, 2018 · 87c70d8 · 87c70d8
2 parents a90c3a1 + 2d132a4
commit 87c70d8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py
@@ -111,7 +111,6 @@
     "join1",
     "gff2bed1",
     "gff_filter_by_feature_count",
-    "Extract genomic DNA 1",
     "aggregate_scores_in_intervals2",
     "Interval_Maf_Merged_Fasta2",
     "GeneBed_Maf_Fasta2",
@@ -166,6 +165,7 @@
     "sam_to_bam": packaging.version.parse("1.1.3"),
     "PEsortedSAM2readprofile": packaging.version.parse("1.1.1"),
     "fetchflank": packaging.version.parse("1.0.1"),
+    "Extract genomic DNA 1": packaging.version.parse("3.0.0"),
 }