diff --git a/tool_conf.xml.sample b/tool_conf.xml.sample index 4ef0b967658..d5849300b20 100644 --- a/tool_conf.xml.sample +++ b/tool_conf.xml.sample @@ -68,9 +68,11 @@ +
diff --git a/tools/annotation_profiler/annotation_profiler_for_interval.py b/tools/annotation_profiler/annotation_profiler_for_interval.py index d1f0aec5807..378ea6b592c 100644 --- a/tools/annotation_profiler/annotation_profiler_for_interval.py +++ b/tools/annotation_profiler/annotation_profiler_for_interval.py @@ -1,10 +1,10 @@ -#!/usr/bin/env python2.4 +#!/usr/bin/env python #Dan Blankenberg #For a set of intervals, this tool returns the same set of intervals #with 2 additional fields: the name of a Table/Feature and the number of #bases covered. The original intervals are repeated for each Table/Feature. -import struct, optparse, os, random +import sys, struct, optparse, os, random from galaxy import eggs import pkg_resources; pkg_resources.require( "bx-python" ) import bx.intervals.io @@ -14,6 +14,8 @@ try: except: pass +assert sys.version_info[:2] >= ( 2, 4 ) + class CachedRangesInFile: fmt = 'I' fmt_size = struct.calcsize( fmt ) diff --git a/tools/encode/random_intervals_no_bits.py b/tools/encode/random_intervals_no_bits.py index a2b6ea7e698..166f493c158 100644 --- a/tools/encode/random_intervals_no_bits.py +++ b/tools/encode/random_intervals_no_bits.py @@ -3,7 +3,7 @@ #%prog bounding_region_file mask_intervals_file intervals_to_mimic_file out_file mask_chr mask_start mask_end interval_chr interval_start interval_end interval_strand use_mask allow_strand_overlaps import sys, random from copy import deepcopy - +from galaxy import eggs import pkg_resources pkg_resources.require( "bx-python" ) import bx.intervals.io diff --git a/tools/filters/axt_to_lav.py b/tools/filters/axt_to_lav.py index 933a5d30d72..88c54b7976c 100644 --- a/tools/filters/axt_to_lav.py +++ b/tools/filters/axt_to_lav.py @@ -10,15 +10,14 @@ The application reads an AXT file from standard input and writes a LAV file to standard out; some statistics are written to standard error. """ -import sys -import copy - +import sys, copy +from galaxy import eggs import pkg_resources pkg_resources.require( "bx-python" ) - import bx.align.axt import bx.align.lav +assert sys.version_info[:2] >= ( 2, 4 ) def usage(s=None): message = """ diff --git a/tools/filters/lav_to_bed.py b/tools/filters/lav_to_bed.py index 6c05da92512..3ffd7953eb7 100644 --- a/tools/filters/lav_to_bed.py +++ b/tools/filters/lav_to_bed.py @@ -1,13 +1,14 @@ #!/usr/bin/env python - #Reads a LAV file and writes two BED files. - import sys +from galaxy import eggs import pkg_resources pkg_resources.require( "bx-python" ) import bx.align.lav +assert sys.version_info[:2] >= ( 2, 4 ) + def main(): try: diff --git a/tools/filters/ucsc_gene_bed_to_exon_bed.py b/tools/filters/ucsc_gene_bed_to_exon_bed.py index de9e737f948..22ded6633d0 100755 --- a/tools/filters/ucsc_gene_bed_to_exon_bed.py +++ b/tools/filters/ucsc_gene_bed_to_exon_bed.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.3 +#!/usr/bin/env python """ Read a table dump in the UCSC gene table format and print a tab separated @@ -17,6 +17,8 @@ options: import optparse, string, sys +assert sys.version_info[:2] >= ( 2, 4 ) + def main(): # Parse command line diff --git a/tools/filters/ucsc_gene_bed_to_intron_bed.py b/tools/filters/ucsc_gene_bed_to_intron_bed.py index cf32bf66bbf..51aab1f36f6 100755 --- a/tools/filters/ucsc_gene_bed_to_intron_bed.py +++ b/tools/filters/ucsc_gene_bed_to_intron_bed.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.3 +#!/usr/bin/env python """ Read a table dump in the UCSC gene table format and print a tab separated @@ -17,6 +17,8 @@ options: import optparse, string, sys +assert sys.version_info[:2] >= ( 2, 4 ) + def main(): # Parse command line diff --git a/tools/filters/ucsc_gene_table_to_intervals.py b/tools/filters/ucsc_gene_table_to_intervals.py index b23e71fe636..8d6e83da914 100755 --- a/tools/filters/ucsc_gene_table_to_intervals.py +++ b/tools/filters/ucsc_gene_table_to_intervals.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.3 +#!/usr/bin/env python """ Read a table dump in the UCSC gene table format and print a tab separated @@ -17,6 +17,8 @@ options: import optparse, string, sys +assert sys.version_info[:2] >= ( 2, 4 ) + def main(): # Parse command line diff --git a/tools/maf/interval_maf_to_merged_fasta.xml b/tools/maf/interval_maf_to_merged_fasta.xml index 2f79708e309..3337ba3466d 100644 --- a/tools/maf/interval_maf_to_merged_fasta.xml +++ b/tools/maf/interval_maf_to_merged_fasta.xml @@ -47,14 +47,14 @@ - + - + diff --git a/tools/maf/maf_filter.py b/tools/maf/maf_filter.py index eb7f0b7a53a..898318b255d 100644 --- a/tools/maf/maf_filter.py +++ b/tools/maf/maf_filter.py @@ -1,6 +1,7 @@ #Dan Blankenberg #Filters a MAF file according to the provided code file, which is generated in maf_filter.xml import sys, os, shutil +from galaxy import eggs import pkg_resources; pkg_resources.require( "bx-python" ) import bx.align.maf diff --git a/tools/maf/maf_limit_to_species.py b/tools/maf/maf_limit_to_species.py index 9f435e1b220..a13a760ec6e 100644 --- a/tools/maf/maf_limit_to_species.py +++ b/tools/maf/maf_limit_to_species.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.3 +#!/usr/bin/env python """ Read a maf file and write out a new maf with only blocks having the @@ -13,6 +13,8 @@ import pkg_resources; pkg_resources.require( "bx-python" ) import bx.align.maf import sys +assert sys.version_info[:2] >= ( 2, 4 ) + def main(): species = sys.argv[1].split( ',' ) diff --git a/tools/maf/maf_to_bed.py b/tools/maf/maf_to_bed.py index 60ca1923bc0..a27af833f1b 100644 --- a/tools/maf/maf_to_bed.py +++ b/tools/maf/maf_to_bed.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.3 +#!/usr/bin/env python """ Read a maf and output intervals for specified list of species. @@ -8,6 +8,8 @@ from galaxy import eggs import pkg_resources; pkg_resources.require( "bx-python" ) from bx.align import maf +assert sys.version_info[:2] >= ( 2, 4 ) + def __main__(): input_filename = sys.argv[1] diff --git a/tools/maf/maf_to_fasta_concat.py b/tools/maf/maf_to_fasta_concat.py index 1e2d8afdc04..3aac8f6b8ff 100755 --- a/tools/maf/maf_to_fasta_concat.py +++ b/tools/maf/maf_to_fasta_concat.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.3 +#!/usr/bin/env python """ Read a maf and print the text as a fasta file, concatenating blocks @@ -12,6 +12,8 @@ import pkg_resources; pkg_resources.require( "bx-python" ) from bx.align import maf from galaxy.tools.util import maf_utilities +assert sys.version_info[:2] >= ( 2, 4 ) + def __main__(): print "Restricted to species:", sys.argv[1] diff --git a/tools/maf/maf_to_fasta_multiple_sets.py b/tools/maf/maf_to_fasta_multiple_sets.py index 8322e3f7788..d48b75041cc 100755 --- a/tools/maf/maf_to_fasta_multiple_sets.py +++ b/tools/maf/maf_to_fasta_multiple_sets.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.3 +#!/usr/bin/env python """ Read a maf and print the text as a fasta file. @@ -10,6 +10,8 @@ import pkg_resources; pkg_resources.require( "bx-python" ) from bx.align import maf from galaxy.tools.util import maf_utilities +assert sys.version_info[:2] >= ( 2, 4 ) + def __main__(): print "Restricted to species:", sys.argv[3] diff --git a/universe_wsgi.ini.sample b/universe_wsgi.ini.sample index 8c8e723d672..cce24544201 100644 --- a/universe_wsgi.ini.sample +++ b/universe_wsgi.ini.sample @@ -142,6 +142,8 @@ static_style_dir = %(here)s/static/june_2007_style/blue [galaxy:tool_runners] biomart = local:/// +blat2wig = pbs:///blast +blat_wrapper = pbs:///blast encode_db1 = local:/// encode_import_all_latest_datasets1 = local:/// encode_import_chromatin_and_chromosomes1 = local:/// @@ -149,8 +151,13 @@ encode_import_gencode1 = local:/// encode_import_genes_and_transcripts1 = local:/// encode_import_multi-species_sequence_analysis1 = local:/// encode_import_transcription_regulation1 = local:/// +generate_coverage_report = pbs:///blast hbvar = local:/// +hist_high_quality_score = pbs:///blast +megablast_wrapper = pbs:///blast +megablast_xml_parser = pbs:///blast microbial_import1 = local:/// +quality_score_distribution = pbs:///blast ucsc_table_direct1 = local:/// ucsc_table_direct_archaea1 = local:/// ucsc_table_direct_test1 = local:///