Commit Graph
83 Commits
Author SHA1 Message Date
Nicola Soranzo 224d8f3fc4 Remove numpy requirement, not used since commit 09ce7a9b17 . 2015-05-15 12:41:08 +01:00
Nicola Soranzo 22d4a1d8c3 dos2unix of tools/ directory. Some whitespace and PEP-8 fixes. 2015-05-15 12:40:52 +01:00
peterjc fce2184e5b Make tool version explicit (Job runner would assume 1.0.0) 2015-03-09 15:21:48 +00:00
John Chilton 4ddab82e9e Add annotated citations for MAF tools.
Add macro file to centralize this and in help citation description as well.
2014-08-06 09:41:38 -04:00
Daniel Blankenberg 5e3e287ce3 Update MAF to BED to use job working directory and built-in primary dataset collection. 2014-04-18 13:23:38 -04:00
Daniel Blankenberg 213986aa7f Update MAF to interval to use job working directory instead of __new_file_path__. 2014-04-18 12:34:08 -04:00
Nate Coraor 465b3ffc8d Make maf-to-bed object-store aware 2013-03-06 12:40:31 -05:00
Jeremy Goecks 9a5679c37c Use mako template in tool help so that dynamic image paths can be used. Fixes #141 2012-08-07 09:40:51 -04:00
Daniel Blankenberg 401d95cc73 MAF stats tool will now skip intervals with length less 1. 2011-09-23 09:36:57 -04:00
Daniel Blankenberg 378c5eeacd Tool help updates. 2011-09-21 04:11:07 -04:00
Daniel Blankenberg 430b953cda Minor tool help updates. 2011-08-25 10:00:09 -04:00
Daniel Blankenberg 1dfdc42fe6 Update tool help for some MAF tools. 2011-05-17 12:07:25 -04:00
Daniel Blankenberg 4eb1b0a79f Better determination in tests if a provided input is a DataToolParameter to better handle .gz and .zip uploads and allowing uploads from a sub-directory of test-data/. 2011-02-28 12:16:28 -05:00
Kanwei Li 2d0b8eb830 Adjust image links in tools to work with a proxy prefix [Brad Chapman]. Fixes #141 2010-12-14 14:22:13 -05:00
James Taylor 6b95a1f7fd Automated merge with https://bitbucket.org/galaxy/galaxy-central/ 2010-08-04 14:01:39 -04:00
Kanwei Li a1f9e6a572 Support for VCFv4.0 and misc VCF fixes [Brad Chapman]
- Support for VCFv4.0, which should be identical to 3.3 support
- Correctly handle chromosome references when they start with 'chr' (instead of just numbers)
- Handle extra empty tabs on the header line which are present in GATK produced VCF and confuse the determination of how many sample states should be parsed.
2010-08-03 10:43:32 -04:00
Daniel Blankenberg 5461c97a7b Update vcf_to_mafcustomtrack tool to enforce a minimum of one dataset to be selected. 2010-07-14 12:18:24 -04:00
Daniel Blankenberg 72c3b8cb89 Enhance VCF to MAF error message when no input file is provided. 2010-07-13 10:44:45 -04:00
James Taylor bb769367ed Make "loc files" more flexible by adding "tool data tables". These are
configured at the application level. Specific tabular data files are
specified in a application config file and bound to names, the tools
then refer to these names. Thus users can configure where location
files are located without modifying tool configs.

Also:

 - Simpler column name configuration
 - Columns can be referred to by name in addition to index in all
   dynamic option filters
 - A data table can merge multiple files
 - Design can support other types of data files
2010-07-08 14:36:59 -04:00
Daniel Blankenberg ff18016e41 Add a VCF to MAF Custom Track converter tool. This tool converts a Variant Call Format (VCF) file into a Multiple Alignment Format (MAF) custom track file suitable for display at genome browsers.
This file should be used for display purposes only (e.g as a UCSC Custom Track). Performing an analysis using the output created by this tool as input is not recommended; the source VCF file should be used when performing an analysis.

Unknown nucleotides are represented as '*' as required to allow the display to draw properly; these include e.g. reference bases which appear before a deletion and are not available without querying the original reference sequence.
2010-06-14 15:07:46 -04:00
Daniel Blankenberg ac86ef683c Update tool tests for MAF to interval tool 2010-03-09 14:29:17 -05:00
Greg Von Kuster cf83cecb0b Better approach to altering initial content of output dataset if necessary. The upload tool will now call the data type's groom_output_dataset() method ( a better name than before_setting_metadata since it is not related to metadata ). This will now also run on the cluster. 2009-12-08 11:46:13 -05:00
Greg Von Kuster 7051ce7dd5 Rename the before_edit() and after_edit() metadata related methods to be more appropriately named before_setting_metadata() and after_setting_metadata(), and add the metthods to all datatype classes. Move sorting of Bam files from the Bam set_meta() method to this new method. 2009-12-08 09:05:35 -05:00
Daniel Blankenberg 87938b9894 Fix MAF to BED tool. This tool should be rewritten to not use a code file, but instead use one of the standard ways to create additional outputs, similar to how maf_to_interval functions. 2009-11-30 15:33:45 -05:00
Greg Von Kuster dc8e7c1039 Eliminate the _monkeypatch_session_method from assignmapper by cleaning up remaining object flushes. The _monkeypatch_query_method remains due to a single object query in ~/datatypes/metadata.py in the FileParameter.wrap() method. The sqlalchemy session is now also passed into the __init__ methods for both HistoryDatasetAssociation and LibraryDatasetDatasetAssociation when the create_dataset param is True to enable methods in the DatasetInstance class to correctly add the created dataset to the sqlalchemy session and flush it. 2009-11-12 15:25:48 -05:00
Greg Von Kuster 8f6e8213a0 Fix most of the db flushes to be compatibel with sqlalchemy 05. Add the _monkeypatch_query_method() back into assignmapper due to a single object.get() method in the MetadataCollection class since Metadata has no current hook into mapping.context ( the sqlalchemy session ). There a 4 flushes in metadata,py and 20 flushes in model.__init__.py that still use the _monkeypatch_session_method in assignmapper due to the same issue, but all other flushes are fixed. 2009-11-11 15:59:41 -05:00
Nate Coraor 56032de2bd Upgrade to Cheetah 2.2.2 2009-11-10 13:47:34 -05:00
Nate Coraor 8d96c8d979 imported patch alchemy05_fixes_02 2009-11-03 12:52:01 -05:00
Daniel Blankenberg 2240756b32 Fix reporting number of regions processed in MAF Stats tool. 2009-09-30 14:06:06 -04:00
Daniel Blankenberg 5f39620e67 Fix limiting species in interval2maf tool. 2009-09-29 21:47:59 -04:00
Kanwei Li 3531212ff6 typo fixes for tools in folders A-M 2009-09-27 23:11:43 -04:00
Daniel Blankenberg 7cd1c6dfd0 Add a MAF to Interval converter that produces a set of intervals with sequence data. 2009-09-17 11:47:37 -04:00
Daniel Blankenberg c8ddfaaadb Fix heading for Example 2 in maf_split_by_species onscreen tool help. 2009-09-04 11:08:10 -04:00
Daniel Blankenberg 87eebd3206 First pass at allowing MAF tools to deal with multiple occurrences of a species within a block. Tool versions have been incremented as necessary.
These changes should only affect output when an input block has a species appearing more than once, with the exception being the MAF to multiple FASTA blocks converters: the FASTA headers have been revised to included the sequence index for a species in a block as well as the block index.

A new tool "Split MAF Blocks by Species" has been added that will split MAF blocks into the complete combination of multiple blocks when a species appears more than once.
2009-09-04 10:40:16 -04:00
James Taylor cff01df993 Accidently commited a testing change, removed 2009-04-29 14:47:18 -04:00
James Taylor 139a30e964 Handle the addition of new tool parameters better in the workflow editor. Default values will be filled in and a message displayed to the user 2009-04-29 13:46:02 -04:00
Daniel Blankenberg 377c2427a7 Allow workflows that contain tools that had parameters added to them after the workflow was created to be edited. Workflows containing tools with added parameters can still not be run until after they are edited and saved. Default values are provided in the workflow building mode.
Allow most MAF tools to allow limiting of output species. MAF tools which do not allow species limiting include Extract Pairwise MAF blocks, MAF Coverage stats, and Filter MAF blocks by Size.

The functionality of Filter MAF blocks by Species and Filter MAF blocks by Size is now available in Filter MAF by specified attributes. Unfortunately tests are still not able to be written for the Filter MAF by specified attributes tool.
2009-02-04 14:55:45 -05:00
Nate Coraor 4f02a56abc merge 2009-01-27 14:49:21 -05:00
Daniel Blankenberg 4279415d2a Fix For MAF Filter tool.
Looks like when grouping parameter types were updated to be recursively wrapped properly, this tool was not updated.
2009-01-26 14:48:45 -05:00
Greg Von Kuster c3e009142a merging from central 2008-12-02 10:55:17 -05:00
Greg Von Kuster ffa719a9ab Call set_size() before set_peek() on datasets, changes to set_peek() to not read entire files for some datatypes. 2008-12-02 10:50:54 -05:00
Daniel Blankenberg 4b24e13514 Resolving Merge 2008-10-22 14:03:41 -04:00
Daniel Blankenberg b9e242e4eb Add a new metadata type of Metadata Files.
These are now used to store the list of chromosomes for species as well as the index for MAF files.

MAF tools have been enhanced to make use of index files when available.

TODO: When datasets are purged from disk, these files should also be purged.
2008-10-22 13:49:22 -04:00
Nate Coraor dfdbef9d36 Reintroduce roles. Unfinished stuff: setting default user and history
permissions, user-side permissions settings on datasets, viewing
associated datasets under the role page in the admin controler (is this
even necessary?), filtering out roles by type.  I haven't addressed
tests, so the security-related functional tests will fail.  I haven't
looked at history sharing yet either.  Cleanup to remove unused methods
is needed in the admin controller.  And the admin templates are a
bit messy.
2008-10-09 17:05:57 -04:00
Daniel Blankenberg 8887c27785 Merging heads 2008-10-09 11:24:19 -04:00
Daniel Blankenberg 09ce7a9b17 Maf stats will now use bitset instead of numpy.zerros. 2008-10-09 11:23:33 -04:00
Daniel Blankenberg 9ab5baa7be Merging heads 2008-09-30 16:18:09 -04:00
Daniel Blankenberg 61ca17eade Add a change_format tag to output datasets in tools. This allows for dynamic switching of output datatype based upon input values.
Several tools have been updated to take advantage of this, eliminating their need for code_files.
2008-09-30 16:17:12 -04:00
Guruprasad Anada e53c5a15a3 Updating security from central 2008-09-17 17:25:17 -04:00
Daniel Blankenberg 9eb8caca6f Small update for maf stats tool. 2008-09-16 13:25:42 -04:00