Commit Graph
13231 Commits
Author SHA1 Message Date
Martin Cech d2c95b43fa Merge pull request #3204 from galaxyproject/release_16.10
Merge release_16.10 into dev
2016-11-21 14:40:05 -05:00
mvdbeek c0a7fabc35 Don't load tools from paths that start with . or _ 2016-11-21 15:20:21 +01:00
Martin Cech 5c4ac18b44 remove unused override
this caused Help/Search to point at /root/tool_search
2016-11-18 11:05:28 -05:00
Dannon Baker e5b56f102a Update version to 17.01.dev 2016-11-17 06:03:37 -05:00
Dannon Baker 9d45f1e48a Update version to 16.10.rc1 2016-11-17 06:03:36 -05:00
Dannon Baker d8c75e2dff Merge pull request #3187 from mvdbeek/samtools_1_3_fix
Make sam to bam converter tool compatible with samtools >= 1.3
2016-11-17 05:51:11 -05:00
mvdbeek 8ace021c0a Single quote variables in sam-to-bam conversion 2016-11-17 10:06:07 +01:00
Dannon Baker 0b8fc7c8cc Merge remote-tracking branch 'guerler/validate_workflow' into dev 2016-11-16 15:43:32 -05:00
mvdbeek efde00d80a Handle samtools 0.x 2016-11-16 21:37:43 +01:00
Ignacio 5bb86a3b68 correct indentation 2016-11-16 20:53:41 +01:00
Ignacio 953ee32599 change parameters to samtools sort command (new samtools vers) 2016-11-16 20:53:41 +01:00
Dannon Baker ac5b7efc5f Merge pull request #3130 from mvdbeek/fix_invalid_section_key
Update ToolPanelElements instance locally
2016-11-16 14:14:43 -05:00
guerler 4e6e7d36f8 Validate cycles and step size before building model for workflow execution 2016-11-16 11:43:17 -05:00
Nicola Soranzo 1d17a29c79 Fixes for pycodestyle 2.2.0 2016-11-15 16:56:50 +00:00
John Chilton 00b147a664 Bring in updates from galaxy-lib. 2016-11-14 12:45:04 -05:00
Nicola Soranzo ca4e8914ec Merge branch 'release_16.07' into dev
Conflicts:
	lib/galaxy/tools/deps/conda_util.py
2016-11-14 14:45:23 +00:00
Nicola Soranzo 7272702617 Merge pull request #3085 from mvdbeek/fix_torque_ssh
[16.07] Finish job for Torque SSH/CLI runner
2016-11-14 13:54:09 +00:00
John Chilton ae3bdf31dc Merge pull request #3127 from mvdbeek/remove_verbose_install_check_16.07
[16.07] Remove verbose_install_check option
2016-11-13 22:59:20 -05:00
John Chilton bfabe00ea8 Merge pull request #3129 from mvdbeek/conda_error_reporting
Pass dependency shell command errors to log
2016-11-13 22:58:34 -05:00
John Chilton 7955077e63 Merge pull request #3155 from nsoranzo/remove_set_output_history
Remove unnecessary set_output_history parameter
2016-11-13 22:46:46 -05:00
John Chilton 46bd40bdc4 Merge pull request #3165 from mvdbeek/quote_data_converters
Quote all paths in converter tool xml
2016-11-13 22:45:13 -05:00
mvdbeek 89e6f77feb Don't quote 2016-11-12 13:58:54 +01:00
mvdbeek 133fd3adfc Quote all paths in converter tools 2016-11-12 11:10:36 +01:00
Nicola Soranzo d3f7510b2d Remove unnecessary set_output_history parameter
Also fix import order and Python3 compatibility.
2016-11-11 18:37:23 +00:00
Dannon Baker 3ec7be2795 Merge pull request #3149 from guerler/fix_hid
Explicitly specify attributes which should be copied to converted datasets
2016-11-11 13:28:36 -05:00
Nicola Soranzo 9c37c6df89 Fixes for flake8-import-order 0.11
Also fix Python3 compatibility.
2016-11-11 15:09:34 +00:00
guerler 019f554e4e Copy hid attribute to converted datasets for hdas only 2016-11-11 08:55:02 -05:00
Dannon Baker 4b2e875802 Merge pull request #3123 from guerler/fix_tool_filters
Display an error message when toolbox filters fails
2016-11-09 09:03:49 -05:00
Nicola Soranzo 7f630ea2dd Fix flake8 linting broken in 7bee2651aa
Also fix import order and Python3 compatibility.
2016-11-09 09:57:18 +00:00
Daniel Blankenberg 00edc47427 Merge pull request #3140 from natefoo/activation-from
Ensure a From: address is set for user activation emails
2016-11-08 13:45:07 -07:00
Nate Coraor 1e142dd33d User activation emails are sent without a From: address if email_from is
unset. Fix this by using `galaxy-no-reply@host` as with other emails we
send.
2016-11-08 13:56:26 -05:00
Nate Coraor 7bee2651aa string_as_bool for message_box_visible on webapps 2016-11-08 13:35:18 -05:00
Nate Coraor 0ba54e9220 Treat the value of message_box_visible in galaxy.ini as a boolean 2016-11-08 12:21:09 -05:00
John Chilton 3b8f543ebd Merge pull request #3132 from lecorguille/patch-2
Update galaxy.xsd
2016-11-07 12:22:06 -05:00
Björn Grüning 78dfb95f02 Merge pull request #3131 from joachimwolff/dev
Extended the linter rules to accept a help attribute for sections
2016-11-07 14:30:23 +01:00
Gildas Le Corguillé 192f66a714 Update galaxy.xsd
Add `hidden_data` in `ParamType`

The context [cufflinks](https://github.com/galaxyproject/tools-devteam/blob/master/tool_collections/cufflinks/cufflinks/cufflinks_wrapper.xml#L142)
`planemo lint .`
```
Applying linter tool_xsd... FAIL
.. ERROR: Invalid tmpw5U2MV found. Errors [/tmp/tmpw5U2MV:144:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element 'param', attribute 'type': [facet 'enumeration'] The value 'hidden_data' is not an element of the set {'text', 'integer', 'float', 'color', 'boolean', 'genomebuild', 'library_data', 'select', 'data_column', 'hidden', 'baseurl', 'file', 'data', 'drill_down', 'data_collection'}.
/tmp/tmpw5U2MV:144:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element 'param', attribute 'type': 'hidden_data' is not a valid value of the atomic type 'ParamType'.
```
I don’t know so much this tag `hidden_data`, but it seems that it’s still in the [Galaxy doc](https://docs.galaxyproject.org/en/latest/dev/schema.html#tool-inputs-param)
2016-11-07 14:14:36 +01:00
Joachim Wolff b169299b5e Extended linter rule for help attribute in section 2016-11-07 14:12:06 +01:00
mvdbeek fb69afae28 Update ToolPanelElements instance locally
in addition to Galaxy's IPC call via send_control_task.
2016-11-07 11:34:02 +00:00
Nicola Soranzo 53a66c9d46 Merge branch 'release_16.04' into release_16.07 2016-11-07 11:17:23 +00:00
Nicola Soranzo 788dc1ebef Merge branch 'release_16.01' into release_16.04
Conflicts:
	lib/galaxy/util/__init__.py
2016-11-07 11:14:33 +00:00
mvdbeek 51050653b4 Rework dependency shell command handling
The approach is to always log a warning with stdout and stderr when
the exit code is not 0.
With this change, one can expect logs like the follwing:
```
galaxy.tools.deps.conda_util DEBUG 2016-11-05 15:14:17,373 Executing command: /home/mvandenb/miniconda3/bin/conda create -y --name __bowtie@0.12.7 bowtie=0.12.7
127.0.0.1 - - [05/nov./2016:15:14:19 +0200] "POST /admin_toolshed/repository_installation_status_updates HTTP/1.1" 200 - "http://127.0.0.1:8080/admin_toolshed/prepare_for_install" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.90 Safari/537.36"
127.0.0.1 - - [05/nov./2016:15:14:22 +0200] "POST /admin_toolshed/repository_installation_status_updates HTTP/1.1" 200 - "http://127.0.0.1:8080/admin_toolshed/prepare_for_install" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.90 Safari/537.36"
galaxy.tools.deps.conda_util WARNING 2016-11-05 15:14:24,029 Failed to execute command-line /home/mvandenb/miniconda3/bin/conda create -y --name __bowtie@0.12.7 bowtie=0.12.7, stderr was:
-------->>begin stderr<<--------

PackageNotFoundError: Package not found: '' Package missing in current linux-64 channels:
  - bowtie 0.12.7*

You can search for packages on anaconda.org with

    anaconda search -t conda bowtie

You may need to install the anaconda-client command line client with

    conda install anaconda-client

-------->>end stderr<<--------
-------->>begin stdout<<--------
Fetching package metadata ...............
Solving package specifications: .

-------->>end stdout<<--------

galaxy.tools.deps.resolvers.conda DEBUG 2016-11-05 15:14:24,030 Removing failed conda install of bowtie, version '0.12.7'
```
This should be helpful for the more obscure errors that can occur with conda.
2016-11-06 21:07:29 +01:00
Björn Grüning 202f96c731 Merge pull request #3125 from mvdbeek/fix_invalid_section_key
Fix tools placed outside of panel section
2016-11-06 15:48:23 +01:00
Björn Grüning 58b7b6cf15 Merge pull request #2696 from peterjc/blast_datatypes
Returning Blast datatypes to Galaxy core (work-in-progress)
2016-11-05 11:20:53 +01:00
guerler 4d623a4d5a Ensure that label key exists before attempting removal 2016-11-04 18:21:48 -04:00
guerler 7456b1f921 Remove unnecessary slashes 2016-11-04 18:12:26 -04:00
mvdbeek c524521956 Make catching XML parsing errors python2.6 compatible 2016-11-04 20:21:05 +01:00
guerler 1c740833e0 Fix import order 2016-11-04 14:59:42 -04:00
Marius van den Beek b1892b7e30 Merge pull request #3100 from nsoranzo/followup_on_3013
Add download_to_file function to galaxy.util
2016-11-04 18:19:12 +01:00
peterjc b5ba9605e5 Mark BLAST XML with EDAM ontology terms.
As per Herve Menager, EDAM format should be 3331 and data 0857
(sequence search results).
2016-11-04 17:00:17 +00:00
peterjc 4159770ed9 Explicitly label blast.py as MIT licensed.
Edward Kirton's contributions were made under the MIT license
while this code was developed outside of the main Galaxy
Project and distributed via the Galaxy Tool Shed). We have not
been able to contact him to authorise re-licensing under the
main Galaxy Project's license instead.
2016-11-04 17:00:17 +00:00