Commit Graph

35229 Commits

Author SHA1 Message Date
Sebastian Kapust 3ec5787f59 Fix tool search overlay link 2018-06-05 17:47:29 +02:00
Marius van den Beek 5ddb6fc179 Merge pull request #6251 from guerler/check_context
Check context for textable mode of select fields
2018-06-05 10:06:16 +02:00
Marius van den Beek 6e0a2213c6 Merge pull request #6273 from nsoranzo/mercurial_api_removal
Use Mercurial CLI instead of API for archive_repository_revision()
2018-06-05 10:04:04 +02:00
Marius van den Beek 0ba8090d22 Merge pull request #6255 from jmchilton/subcollection_mapping_with_multi_data_inputs
Fix collection mapping to allow subcollection mapping over multi-data inputs.
2018-06-05 09:30:46 +02:00
Nicola Soranzo c8e483e7b3 Remove files only if created
If an exception is raised in the `try` block before the files are
created, an exception was generated in the `finally` block:

```
  File "/home/nicola/software/nsoranzo_galaxy/lib/galaxy/webapps/tool_shed/controllers/repository.py", line 945, in export
    repositories_archive, error_message = erm.export_repository()
  File "/home/nicola/software/nsoranzo_galaxy/lib/tool_shed/capsule/capsule_manager.py", line 109, in export_repository
    if os.path.exists(tmp_export_info):
UnboundLocalError: local variable 'tmp_export_info' referenced before assignment
```
2018-06-05 02:30:33 +01:00
Nicola Soranzo eaec9d248e Use Mercurial CLI instead of API for archive_repository_revision() 2018-06-05 02:30:33 +01:00
Nicola Soranzo eb67e4a627 Remove unused hg_util.get_config() function 2018-06-04 18:23:54 +01:00
Nicola Soranzo bd0e1f534e Remove bundle_to_json() and other unused functions
Last usage was removed in commit af4fab16f5 .
2018-06-04 18:05:49 +01:00
Marius van den Beek 6911153c30 Merge pull request #6213 from jmchilton/one_more_identifier_test
Test element_identifier usage with single data parameters, in repeat/cond.
2018-06-04 16:19:01 +02:00
John Chilton b08455ecab Merge pull request #6265 from nsoranzo/python3
Python3 fixes
2018-06-04 07:02:00 -04:00
John Chilton 2f6c184e6f Merge pull request #6253 from mvdbeek/mapping_over_from_param_fixes
Mapping over from_param fixes
2018-06-04 06:59:18 -04:00
Nicola Soranzo e81931cd75 Fix loading of tools under Python 3
Tools containing a text parameter fail with a traceback like:
```
[pid: 2433|app: 0|req: 15/28] 127.0.0.1 () {42 vars in 905 bytes} [Sun Jun  3 02:24:59 2018] GET /api/tools/addValue/build?version=1.0.0&__identifer=nv6x1qdhzxo&tool_version=1.0.0 => generated 71 bytes in 58 msecs (HTTP/1.1 500) 3 headers in 143 bytes (1 switches on core 1)
galaxy.web.framework.decorators ERROR 2018-06-03 02:25:01,999 [p:2433,w:1,m:0] [uWSGIWorker1Core0] Uncaught exception in exposed API method:
Traceback (most recent call last):
  File "lib/galaxy/web/framework/decorators.py", line 281, in decorator
    rval = func(self, trans, *args, **kwargs)
  File "lib/galaxy/webapps/galaxy/api/tools.py", line 113, in build
    return tool.to_json(trans, kwd.get('inputs', kwd))
  File "lib/galaxy/tools/__init__.py", line 1913, in to_json
    'state_inputs'  : params_to_strings(self.inputs, state_inputs, self.app),
  File "lib/galaxy/tools/parameters/__init__.py", line 207, in params_to_strings
    rval[key] = value if nested else str(dumps(value))
  File "/usr/lib/python3.5/json/__init__.py", line 230, in dumps
    return _default_encoder.encode(obj)
  File "/usr/lib/python3.5/json/encoder.py", line 198, in encode
    chunks = self.iterencode(o, _one_shot=True)
  File "/usr/lib/python3.5/json/encoder.py", line 256, in iterencode
    return _iterencode(o, 0)
  File "/usr/lib/python3.5/json/encoder.py", line 179, in default
    raise TypeError(repr(o) + " is not JSON serializable")
TypeError: b'c1,c2' is not JSON serializable
```
2018-06-03 04:12:21 +01:00
Nicola Soranzo 662682c148 unicodify bytestrings from uwsgi.opt
Fix the 2 following tracebacks:

```
added lib/ to pythonpath.
Traceback (most recent call last):
  File "lib/galaxy/webapps/galaxy/buildapp.py", line 180, in uwsgi_app
    return galaxy.web.framework.webapp.build_native_uwsgi_app(app_factory, "galaxy")
  File "lib/galaxy/web/framework/webapp.py", line 968, in build_native_uwsgi_app
    app_kwds = get_app_kwds(config_section)
  File "lib/galaxy/web/stack/__init__.py", line 434, in get_app_kwds
    return application_stack_class().get_app_kwds(config_section, app_name=app_name)
  File "lib/galaxy/web/stack/__init__.py", line 260, in get_app_kwds
    has_ini_config = has_ini_config or (config_file and has_ext(config_file, "ini", aliases=True, ignore="sample"))
  File "lib/galaxy/util/path/__init__.py", line 290, in has_ext
    root, _ext = __splitext_ignore(path, ignore=ignore)
  File "lib/galaxy/util/path/__init__.py", line 387, in __splitext_ignore
    root, ext = __splitext_no_sep(path)
  File "lib/galaxy/util/path/__init__.py", line 381, in __splitext_no_sep
    return (path.rsplit(extsep, 1) + [''])[0:2]
TypeError: a bytes-like object is required, not 'str'
unable to load app 0 (mountpoint='') (callable not found or import error)
```

```
galaxy.queue_worker INFO 2018-06-03 02:12:51,186 [p:2150,w:1,m:0] [MainThread] Binding and starting galaxy control worker for main.web.1
Traceback (most recent call last):
  File "lib/galaxy/web/stack/__init__.py", line 456, in _do_uwsgi_postfork
    f(*args, **kwargs)
  File "lib/galaxy/webapps/galaxy/buildapp.py", line 190, in postfork_setup
    app.application_stack.log_startup()
  File "lib/galaxy/web/stack/__init__.py", line 351, in log_startup
    for s in UWSGIApplicationStack._serving_on():
  File "lib/galaxy/web/stack/__init__.py", line 237, in _serving_on
    yield UWSGIApplicationStack._socket_opt_to_str(opt, val)
  File "lib/galaxy/web/stack/__init__.py", line 208, in _socket_opt_to_str
    if val.startswith('='):
TypeError: startswith first arg must be bytes or a tuple of bytes, not str
```
2018-06-03 03:28:23 +01:00
Nicola Soranzo 78d290c9fb Do not install py2-ipaddress under Python 3 2018-06-03 03:28:06 +01:00
mvdbeek 8f5552f50c Fix up subcollection_type 2018-06-02 07:17:51 -04:00
Dannon 9cf66df7a7 Merge pull request #6171 from nsoranzo/pr_approval
[PROCEDURES] Clarify how +1 votes on PRs can be expressed v.3
2018-06-01 16:45:45 -04:00
Björn Grüning 1954c9dc63 Merge pull request #6201 from cmonjeau/add_sbml_datatype
New datatype: SBML
2018-06-01 22:39:12 +02:00
Dannon 5ba71f580f Merge pull request #6215 from natefoo/dynamic-rule-dynamic-reload
Enable automatic reload of dynamic job rules on change
2018-06-01 11:38:24 -04:00
Nate Coraor a5594551c0 Merge pull request #6036 from mvdbeek/kill_jobs_with_invalid_input
Pause jobs with invalid inputs
2018-06-01 10:37:56 -04:00
John Chilton f19f09b30f Merge pull request #6248 from guerler/form_fix
Align input element update mechanism
2018-06-01 10:11:30 -04:00
Nate Coraor 1652c4221e Merge pull request #8 from dannon/dynamic-rule-dynamic-reload
Avoid using builtins for variable names.
2018-06-01 09:40:03 -04:00
Dannon Baker 73ea1189e9 Avoid using builtins for variable names. file->file_path, dir->dir_path in generic watcher functions 2018-06-01 08:56:15 -04:00
John Chilton b908ea4530 Fix collection mapping to allow mapping over multi-data inputs.
It is jarring to users that works for collection inputs but not multiple data inputs, especially because the IUC discourages collection inputs when multiple data inputs would work.
2018-06-01 06:20:27 -04:00
John Chilton 48fda8debc Merge pull request #68 from mvdbeek/one_more_identifier_test
Use 4-space indent in identifier_single_in_repeat test tool
2018-06-01 05:51:13 -04:00
mvdbeek c401f5a713 Use info style when displaying the reason for pausing a dataset 2018-06-01 11:07:54 +02:00
mvdbeek 6ace37e910 Use 4-space indent in identifier_single_in_repeat test tool 2018-06-01 10:56:38 +02:00
mvdbeek f690386f0b Drop unused COLLECTION_ATTRIBUTES 2018-06-01 09:38:58 +02:00
Martin Cech 53d2664b0b Merge pull request #6200 from erasche/grt-asdf
Permit numeric values of GRT instance ID in config
2018-05-31 15:31:59 -05:00
Dannon Baker 06d0fcc0de Merge remote-tracking branch 'upstream/release_18.05' into dev 2018-05-31 16:09:26 -04:00
Dannon Baker 44b42e7e7e Merge remote-tracking branch 'upstream/release_18.01' into release_18.05 2018-05-31 16:08:55 -04:00
Martin Cech fb78fabcd7 Merge pull request #6216 from dannon/chart_download_fix
Charts filename download fix
2018-05-31 14:30:12 -05:00
guerler 5c65012f9c Fix list parameter style 2018-05-31 14:30:12 -04:00
guerler cb98bb23f3 Adjust drilldown handler 2018-05-31 14:10:16 -04:00
Dannon b137d5cf34 Merge pull request #6239 from lparsons/fix_paster_args
[18.01] Hack paster args to not duplicate pid file stuff for RUN_ALL.
2018-05-31 14:06:27 -04:00
Nicola Soranzo 05fe17a590 Fix SelectToolParameter doctests 2018-05-31 17:10:36 +01:00
Lance Parsons 88c94fc49b Set pid and log file for paster in server_args
This avoids setting log and pid file in paster_args so that with
GALAXY_RUN_ALL they can be set individually, but ensures they are set
when running paster otherwise.
2018-05-31 12:07:02 -04:00
mvdbeek ca31222cf8 Optimize job resume function 2018-05-31 16:18:39 +02:00
mvdbeek f8cc653b30 Pause job if input dataset state is paused 2018-05-31 16:18:39 +02:00
mvdbeek f9a65a10eb Display the info field for paused jobs 2018-05-31 16:18:39 +02:00
mvdbeek ed0b087926 Fail jobs with purged inputs
We can't resume these jobs anyway, so better to set them to failed.
Also resets the info field for datasets produced by resumed jobs.
2018-05-31 16:18:39 +02:00
mvdbeek 0e31f97269 Add a testcase for pausing jobs with deleted input
Fix test
2018-05-31 16:18:39 +02:00
mvdbeek c1614be1ef Pause jobs with invalid inputs
Otherwise these jobs may hang around forever/until the admin
does a cleanup. This is probably preferable for users as well,
as the pause message gives a hint of why their job didn't start
running. Fixes https://github.com/galaxyproject/galaxy/issues/6022
and would minimize maintenance as outlined in https://github.com/galaxyproject/galaxy/issues/5944.

I'm working on tests, but one easy way to test this is create a collection
through the list builder interface, then delete the source HDAs.
Then run a workflow on the collection and without this commit
the outputs get created but the job just hangs around indefinetely.
With the PR the steps consuming the collection and the subsequent jobs
will be paused.

Set to paused
2018-05-31 16:18:39 +02:00
Nicola Soranzo dfd80d7d71 Fix indentation 2018-05-31 14:51:41 +01:00
mvdbeek 99889af1d5 Test case for mapping over inputs with output ftype determined via input extension 2018-05-31 15:15:16 +02:00
mvdbeek 50c98701b7 Do not adapt target collection to child collection type
Otherwise mapping over list:list:pair to a pair input breaks
at https://github.com/galaxyproject/galaxy/blob/21b44bf348ae10d170ab96a3b6f30bf9dbbd5a4a/lib/galaxy/dataset_collections/subcollections.py#L12.

This and the previous commit should fix
https://github.com/galaxyproject/tools-iuc/issues/1563.
2018-05-31 15:14:14 +02:00
mvdbeek 825d7f6fa7 Allow from_param to reference a child collection
This is necessary when mapping over a collection over an input
that is referenced in the output section, like so:
```
...
<when value="paired_collection">
    <action type="format">
        <option type="from_param" name="library.input_1" param_attribute="reverse.ext" />
    </action>
</when>
...
```
2018-05-31 15:14:14 +02:00
Dannon fd25d51b8e Merge pull request #6252 from katrinleinweber/patch-1
Refactor dx_url to doi_url to match domain name
2018-05-31 06:30:31 -04:00
Katrin Leinweber ac7c6e5d94 Refactor to match domain name (follow-up to #6244) 2018-05-31 07:47:35 +01:00
guerler 0022615418 Handle alternative option formatting in text select wrapper 2018-05-31 01:30:14 -04:00
guerler 0bad91c592 Parse data as is to select field 2018-05-31 00:20:55 -04:00