Commit Graph
14548 Commits
Author SHA1 Message Date
John Chilton d14eb9e63c Add the ability to control job conf plugin loading from environment variables.
All job configuration parameters can be set using environment variables but currently the actual loading of the plugin cannot. This is problematic for setting up single job confs for multiple environemnts (like done with docker-galaxy-stable) when using plugins that may hang waiting for resources (such as Kubernetes for the K8 runner or a MQ for Pulsar for instance) or may require library dependencies not be setup in every environment the job configuration is deployed in.

xref https://github.com/bgruening/docker-galaxy-stable/pull/328

Rebased with advice from @bgruening.
2017-06-06 14:20:24 -04:00
John Chilton 9d1a382f86 Merge pull request #4098 from mvdbeek/download_collection
Add possibility for downloading entire collections
2017-06-05 08:49:32 -04:00
John Chilton 00de5b9f9a Merge remote-tracking branch 'jmchilton/dev' into download_collection 2017-06-05 08:48:42 -04:00
John Chilton 294c1d1154 Merge pull request #4120 from theosotr/fix-client-initialization
Fix chronos client initialization
2017-06-05 08:40:50 -04:00
Martin Cech 1fc12ebf1c Merge pull request #4146 from nsoranzo/doc_fixes
Documentation fixes and improvements
2017-06-02 13:24:41 -04:00
Dannon Baker e8f730895c Merge remote-tracking branch 'guerler/remove_grids_mako' into dev 2017-06-02 12:54:25 -04:00
Nicola Soranzo 71df810ddb Document <hook> sub-element of <code>
This is deprecated and used only by:
- https://toolshed.g2.bx.psu.edu/view/devteam/cluster/
- https://toolshed.g2.bx.psu.edu/view/devteam/merge/

Fix https://github.com/galaxyproject/galaxy/issues/3516 .
2017-06-02 15:09:44 +01:00
Nicola Soranzo 92952882d2 Fix some links and syntax errors in tool XML doc 2017-06-02 15:09:44 +01:00
Nicola Soranzo d807ed0f75 Merge branch 'release_17.05' into dev
Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/bundled/login.bundled.js.map
2017-06-02 15:05:14 +01:00
Aysam Guerler 0272e188a8 Merge pull request #4139 from dannon/tag_sorting
[17.05] Tag fixes
2017-06-02 02:05:44 -04:00
Dannon Baker 20d2303d34 Merge remote-tracking branch 'upstream/release_17.05' into dev 2017-06-01 13:39:36 -04:00
E Rasche 2f992d90ae Rebase 2017-06-01 16:43:21 +00:00
Daniel Blankenberg c2348340cf Fix for Data Tables loaded from a URL. 2017-06-01 12:36:37 -04:00
Dannon Baker 0954290e5d Combine list comprehensions, slightly tweak logic. 2017-06-01 10:38:18 -04:00
Dannon Baker 12905321ca Allow hashtag usage in workflow PJA tag addition mechanism 2017-06-01 10:38:18 -04:00
Dannon Baker 0c43954e8d Slight tweak of logic in tag filtering PJA 2017-06-01 10:38:18 -04:00
Dannon Baker 967c363786 Filter tags for empties (fixes #4127) 2017-06-01 10:38:18 -04:00
Daniel Blankenberg a9d0d3671a Fix for returning a fileobject in compression_utils.py when handling a zipfile.
Will return the first named object in the archive. zipfile.os_zipfile does not exist...
2017-05-31 16:55:32 -04:00
Dannon Baker b6597d43f3 Merge remote-tracking branch 'upstream/release_17.05' into dev 2017-05-31 15:06:35 -04:00
guerler b764d35cf7 Merge branch 'dev' into remove_grids_mako 2017-05-30 20:09:38 -04:00
Thodoris Sotiropoulos 4c888be5ab minor fix: make expession be in one line 2017-05-30 21:24:11 +03:00
Dannon Baker 9896fc0e9f Merge pull request #4092 from bgruening/workflowexport_mako
New Configure Workflow Menu UI
2017-05-30 13:36:12 -04:00
Martin Cech 42e274d334 Merge pull request #4122 from galaxyproject/release_17.01
[17.05] merge Release 17.01
2017-05-30 10:11:51 -04:00
peterjc 54d6a54367 Avoid locale specific string.letters for job_name
The job_name sanitation can fail if the locale specific
string.letters contains unexpected characters. e.g.
Saravanaraj Ayyampalayam reported getting the following
under locale en_US.iso885915

Traceback (most recent call last):
  File /.../galaxy-dist/lib/galaxy/jobs/runners/drmaa.py, line 397, in <genexpr>
    job_name = ''.join( x if x in ( string.letters + string.digits + '_' ) else '_' for x in job_name )
UnicodeDecodeError: 'ascii' codec can't decode byte 0xa6 in position 52: ordinal not in range(128)

See http://dev.list.galaxyproject.org/Issue-with-job-name-UnicodeDecodeError-in-drmaa-td4670784.html
or https://lists.galaxyproject.org/pipermail/galaxy-dev/2017-May/025687.html

The downside of this proposed change would be to mask
reasonable non ASCII letters from the job name on a
well defined system with consistent locale settings
for both Galaxy and the Cluster. But ASCII only seems
safer.
2017-05-29 17:40:37 +01:00
Thodoris Sotiropoulos bd361d550c Fix chronos client initialization
Provide the missing keyword arguments during chronos client
initialization based on the runner parameters.
2017-05-29 16:59:17 +03:00
John Chilton 55336d2c31 Fix legacy Python path for genome diversity tools from miller lab.
Fixes #4108.
2017-05-28 19:34:20 -04:00
Dannon Baker dd06a01746 Handle *both* paths for tag appending using the now-dict correctly. 2017-05-26 10:22:13 +01:00
Dannon Baker b6e8d3e8ac Slight refactoring to use a dict for unique'ing preserved tags. TODO: enhance object builtins to compare correctly so we can use a set, maybe. Not a big deal unless/until we have a second type of preserved tag though. 2017-05-26 10:14:48 +01:00
Dannon Baker 68433b1eff Force uniqueness of preserved tags (so, don't allow many inputs with a 'name:foo' tag to add a ton of 'name:foo' tags to a dataset; just use one) 2017-05-25 15:33:09 +01:00
guerler 6f5e76eecc Fix bad merge for populate model 2017-05-24 12:59:30 -04:00
Martin Cech 18ef6a6ab0 Update version to 17.05 2017-05-24 10:47:27 -04:00
Martin Cech e50c787aa7 Merge branch 'release_17.05' into dev 2017-05-24 10:47:20 -04:00
Nicola Soranzo 31015a83af Remove residual comment
Follow-up on https://github.com/galaxyproject/galaxy/pull/4089
2017-05-24 11:18:47 +01:00
Nicola Soranzo e0c0111524 Merge branch 'release_17.05' into dev 2017-05-23 23:32:33 +01:00
Martin Cech 0268f5078c Merge pull request #4107 from guerler/fix_repeats_in_workflows
[17.05] Fixes repeat handling in workflow editor, store values as passed from ui
2017-05-23 13:50:26 -04:00
Martin Cech 3d1da8e11d Merge pull request #4089 from mvdbeek/no_global_changes
[17.05] Do not modify self.app.config.tool_data_path
2017-05-23 13:19:41 -04:00
Martin Cech aa8aafb109 Merge pull request #4104 from dannon/tags_continued
[17.05] Change to only inheriting 'name' tags
2017-05-23 13:01:19 -04:00
guerler 4dcc145dbf Remove composite api function and duplicate resource connector 2017-05-23 12:19:03 -04:00
guerler 6f8472e525 Fixes repeat handling in workflow editor, store values as passed from ui 2017-05-23 08:08:28 -04:00
Nicola Soranzo e4de203c7d Raise an exception if name or action are not defined
instead of silently skipping the <environment_variable> tool dependency
2017-05-23 10:38:06 +01:00
Nicola Soranzo a033a5821a Allow empty <environment_variable>
Presently trying to install a ToolShed tool dependency defined as

<tool_dependency>
    <set_environment version="1.0">
        <environment_variable name="MYVAR" action="set_to"></environment_variable>
    </set_environment>
</tool_dependency>

results in EnvManager.create_env_var_dict() returning None, which in turn
causes the dependency silently not being installed with this error in the
logs:

tool_shed.galaxy_install.tool_dependencies.recipe.tag_handler DEBUG 2017-05-23 10:08:23,798 Error setting environment for tool dependency: local variable 'tool_dependency' referenced before assignment
2017-05-23 10:35:25 +01:00
anuprulez 53037f6006 Updating url in the comments of workflow api 2017-05-23 11:24:15 +02:00
anuprulez 852aa51225 Making one api url for getting and setting workflows menu 2017-05-23 11:12:57 +02:00
guerler f5671be1cf Remove semicolon 2017-05-22 22:39:23 -04:00
guerler b2e517e41d Remove unused properties in new format 2017-05-22 16:36:05 -04:00
mvdbeek 3084e192cb Add API route for downloading entire collections
Entire collections can now be downloaded as tarballs. I have used the
StreamBall class from galaxy.utils, so archives start downloading
immediately.

The collection structure is mapped onto a directory struture, where each
level of a collection is a directory in the archive.  Collections of BAM
files are included alongside their .bai indices, and composite datatype
are supported as well.

API tests for downloading list, paired and list:paired collections are
included.

Currently collection elements that are not in the OK status will be
skipped, so we should probably hide the download button if not all
collection elements are in a final state.
2017-05-22 22:32:27 +02:00
guerler c33bf70657 Use makoless grid for published page list 2017-05-22 16:04:42 -04:00
guerler 3edc8b0275 Modify grids helper, return dictionary instead of html 2017-05-22 15:39:35 -04:00
anuprulez 56fcd293b5 Fixing PR review comments 2017-05-22 19:26:44 +02:00
anuprulez 8975327cfd Adjusting indentation 2017-05-22 15:35:14 +02:00