Commit Graph
44653 Commits
Author SHA1 Message Date
Aysam Guerler a36a669496 Merge pull request #9138 from jmchilton/wfrun2vue_0
Refactor Workflow Run Form Toward Vue (part 1)
2020-02-17 14:00:03 -05:00
Dannon ecef6ed138 Merge pull request #9373 from OlegZharkov/citation-special-characters-fix
fix special characters in citation field
2020-02-14 13:53:36 -05:00
Nicola Soranzo 7d67b348c0 Merge branch 'release_20.01' into dev 2020-02-14 11:51:11 +00:00
Oleg ZharkovandNicola Soranzo f80f565526 Update lib/galaxy/managers/citations.py
https://citation.crosscite.org/docs.html

Co-Authored-By: Nicola Soranzo <nicola.soranzo@gmail.com>
2020-02-14 11:07:42 +01:00
John Chilton 5e448ebce7 Merge pull request #9289 from dannon/fix_edge
MS Edge Fixes
2020-02-13 11:23:45 -05:00
Oleg ZharkovandMarius van den Beek fada553a8c Update lib/galaxy/managers/citations.py
change "utf-8" to apparent_encoding

Co-Authored-By: Marius van den Beek <m.vandenbeek@gmail.com>
2020-02-13 16:57:46 +01:00
Oleg Zharkov 055aca1cb9 fix special characters in citation field 2020-02-13 16:34:20 +01:00
Marius van den Beek fc713a3cd5 Merge pull request #9363 from nsoranzo/release_20.01_remove_GenomeSpace
[20.01] Remove GenomeSpace tools, OpenID, UI and requirements
2020-02-13 14:14:39 +01:00
Nicola Soranzo cbb071fc49 Remove GenomeSpace tools, OpenID, UI and requirements 2020-02-13 09:50:29 +00:00
Nicola Soranzo 4e5ec84ff7 Skip `test_config_option[build_sites_config_file]`
Fix:

```
_________________ test_config_option[build_sites_config_file] __________________

data = OptionData(key='build_sites_config_file', expected='config/build_sites.yml.sample', loaded='/home/runner/work/galaxy/galaxy root/lib/galaxy/config/sample/build_sites.yml')
driver = <galaxy_test.driver.driver_util.GalaxyTestDriver object at 0x7f0accbf93d0>

    @pytest.mark.parametrize('data', get_config_data(), ids=get_key)
    def test_config_option(data, driver):
>       assert data.expected == data.loaded
E       AssertionError: assert 'config/build...es.yml.sample' == '/home/runner/...ild_sites.yml'
E         - config/build_sites.yml.sample
E         + /home/runner/work/galaxy/galaxy root/lib/galaxy/config/sample/build_sites.yml
```

from https://github.com/galaxyproject/galaxy/pull/9353/checks?check_run_id=438827128
2020-02-13 09:49:51 +00:00
Marius van den Beek b37e8d5e6b Merge pull request #9366 from dannon/citation-link-tweak
Prevent duplicate listing of doi link and link (text, with href doi link)
2020-02-13 10:32:42 +01:00
Nicola Soranzo 6f0219e883 Merge branch 'release_20.01' into dev 2020-02-13 02:12:03 +00:00
Nicola Soranzo f16e5cb712 Merge branch 'release_19.09' into release_20.01 2020-02-13 02:11:15 +00:00
Nicola Soranzo 1930a0fcf7 Merge pull request #9364 from mvdbeek/fix_tools_disappearing_after_restart
[19.09] Always add shed_tool_config file to tool_configs
2020-02-13 01:08:09 +00:00
Dannon Baker 7f52daa4d2 Minor simplification. 2020-02-12 09:58:08 -05:00
Dannon Baker f362c15d4c Prevent duplicate listing of doi link and link (text, with href doi link) 2020-02-12 09:55:56 -05:00
mvdbeek e1780cb20a Move logic of whether to load a config into can_load_config_file and fix unit tests 2020-02-12 11:53:28 +01:00
mvdbeek 0421553fca Always add shed_tool_config file to tool_configs
This should fix https://github.com/galaxyproject/galaxy/issues/9356
The bug itself was due to not calling toolbox._load_tool_panel()
after injecting the default shed_tool_config_file into the toolbox,
but implentation-wise it seems better to have this logic inside
the toolbox.
2020-02-12 11:08:38 +01:00
Nicola Soranzo 4e5db8de11 Merge branch 'release_20.01' into dev 2020-02-12 09:37:46 +00:00
Marius van den Beek 4f37e8e35b Merge pull request #9359 from mvdbeek/make_integrated_tool_panel_writing_more_robust
[20.01] Use RenamedTemporaryFile for safer integrated_tool_panel_file writing
2020-02-12 09:46:11 +01:00
Nicola Soranzo 4259b52012 Merge branch 'release_20.01' into dev 2020-02-12 01:32:24 +00:00
Nicola Soranzo 86841c390c Small cleanup 2020-02-12 01:29:57 +00:00
Nicola Soranzo 68ef1bdff7 Merge pull request #9348 from mvdbeek/make_looks_like_xml_more_robust
[20.01] Make linters more robust on python 3
2020-02-12 01:15:04 +00:00
Nicola Soranzo f831bd842e Merge branch 'release_20.01' into dev 2020-02-12 01:11:09 +00:00
Nicola Soranzo 32b2da2035 Merge pull request #9360 from mvdbeek/fix_custom_build_display_if_dataset_deleted
[20.01] Only get non-deleted datasets when listing custom dbkeys
2020-02-12 01:06:26 +00:00
John Chilton d31a4ed84d Merge pull request #9357 from nsoranzo/skip_test_config_option_build_sites_config_file
Skip ``test_config_option[build_sites_config_file]``
2020-02-11 15:07:46 -05:00
mvdbeek 9ecb21cc61 Can't combine get with filter 2020-02-11 19:55:30 +01:00
mvdbeek d85f44514e Use RenamedTemporaryFile for safer integrated_tool_panel_file writing
If not using the largely undocumented and debug-y `integrated_tool_panel_tracking_directory`
we should use RenamedTemporaryFile which creates a temp file in the
directory where `integrated_tool_panel_file` lives, and upon succesful
write rename the file to `integrated_tool_panel_file`.
We use this in other places in the code and it seems to work well
when multiple threads are potentially modifying the target file.
2020-02-11 19:47:38 +01:00
mvdbeek 95fba0f9b1 Minor cleanup 2020-02-11 19:38:42 +01:00
mvdbeek 6f7e8881f5 Don't propagate missing dbkeys 2020-02-11 19:37:26 +01:00
mvdbeek 5640a37343 Move the state filtering into the query 2020-02-11 19:10:18 +01:00
mvdbeek 8c80bca212 Only get non-deleted datasets when listing custom dbkeys 2020-02-11 19:01:26 +01:00
Nicola Soranzo 1893157fb9 Skip `test_config_option[build_sites_config_file]`
Fix:

```
_________________ test_config_option[build_sites_config_file] __________________

data = OptionData(key='build_sites_config_file', expected='config/build_sites.yml.sample', loaded='/home/runner/work/galaxy/galaxy root/lib/galaxy/config/sample/build_sites.yml')
driver = <galaxy_test.driver.driver_util.GalaxyTestDriver object at 0x7f0accbf93d0>

    @pytest.mark.parametrize('data', get_config_data(), ids=get_key)
    def test_config_option(data, driver):
>       assert data.expected == data.loaded
E       AssertionError: assert 'config/build...es.yml.sample' == '/home/runner/...ild_sites.yml'
E         - config/build_sites.yml.sample
E         + /home/runner/work/galaxy/galaxy root/lib/galaxy/config/sample/build_sites.yml
```

from https://github.com/galaxyproject/galaxy/pull/9353/checks?check_run_id=438827128
2020-02-11 17:27:39 +00:00
John Chilton 25483c3ba7 Merge pull request #9351 from nsoranzo/maketrans
Consistent "import" of maketrans
2020-02-11 08:31:44 -05:00
mvdbeek 83d17b2f5b Merge branch 'release_20.01' into dev 2020-02-11 09:43:08 +01:00
mvdbeek 38d2eecae6 Merge branch 'release_19.09' into release_20.01 2020-02-11 09:41:48 +01:00
Marius van den Beek 97eda8e4b5 Merge pull request #9350 from nsoranzo/release_19.09_fix_sam_pileup_fixed_version
[19.09] Fix version in which ``sam_pileup`` was fixed
2020-02-11 09:36:17 +01:00
Nicola Soranzo 7c1cacebbd Consistent "import" of maketrans
Trying first with the most recent version is considered more Pythonic,
I think.
2020-02-11 03:46:25 +00:00
Nicola Soranzo b7c6f4eb44 Fix version in which `sam_pileup` was fixed
xref. https://github.com/galaxyproject/galaxy/pull/9320/files#r376192439
2020-02-11 02:55:09 +00:00
Nicola Soranzo 19ef36ab9c Merge branch 'release_20.01' into dev 2020-02-11 02:46:03 +00:00
Nicola Soranzo a93fe36177 Use `io.open()` 2020-02-10 17:10:59 +00:00
mvdbeek c1261948c2 Fix linting error on python 3 if no version is defined
Fixes
```
Traceback (most recent call last):
  File "/Users/mvandenb/.pyenv/versions/3.6.9/bin/planemo", line 11, in <module>
    load_entry_point('planemo', 'console_scripts', 'planemo')()
  File "/Users/mvandenb/.pyenv/versions/3.6.9/lib/python3.6/site-packages/click/core.py", line 764, in __call__
    return self.main(*args, **kwargs)
  File "/Users/mvandenb/.pyenv/versions/3.6.9/lib/python3.6/site-packages/click/core.py", line 717, in main
    rv = self.invoke(ctx)
  File "/Users/mvandenb/.pyenv/versions/3.6.9/lib/python3.6/site-packages/click/core.py", line 1137, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
  File "/Users/mvandenb/.pyenv/versions/3.6.9/lib/python3.6/site-packages/click/core.py", line 956, in invoke
    return ctx.invoke(self.callback, **ctx.params)
  File "/Users/mvandenb/.pyenv/versions/3.6.9/lib/python3.6/site-packages/click/core.py", line 555, in invoke
    return callback(*args, **kwargs)
  File "/Users/mvandenb/.pyenv/versions/3.6.9/lib/python3.6/site-packages/click/decorators.py", line 64, in new_func
    return ctx.invoke(f, obj, *args, **kwargs)
  File "/Users/mvandenb/.pyenv/versions/3.6.9/lib/python3.6/site-packages/click/core.py", line 555, in invoke
    return callback(*args, **kwargs)
  File "/Users/mvandenb/src/planemo/planemo/cli.py", line 190, in handle_blended_options
    return f(*args, **kwds)
  File "/Users/mvandenb/src/planemo/planemo/commands/cmd_lint.py", line 58, in cli
    recursive=kwds["recursive"]
  File "/Users/mvandenb/src/planemo/planemo/tool_lint.py", line 33, in lint_tools_on_path
    if not lint_tool_source(tool_xml, name=basename(tool_path), **lint_args):
  File "/Users/mvandenb/.pyenv/versions/3.6.9/lib/python3.6/site-packages/galaxy/tool_util/lint.py", line 18, in lint_tool_source
    lint_tool_source_with(lint_context, tool_source, extra_modules)
  File "/Users/mvandenb/.pyenv/versions/3.6.9/lib/python3.6/site-packages/galaxy/tool_util/lint.py", line 54, in lint_tool_source_with
    lint_context.lint(name, value, tool_source)
  File "/Users/mvandenb/.pyenv/versions/3.6.9/lib/python3.6/site-packages/galaxy/tool_util/lint.py", line 83, in lint
    lint_func(lint_target, self)
  File "/Users/mvandenb/.pyenv/versions/3.6.9/lib/python3.6/site-packages/galaxy/tool_util/linters/general.py", line 27, in lint_general
    parsed_version = packaging.version.parse(version)
  File "/Users/mvandenb/.pyenv/versions/3.6.9/lib/python3.6/site-packages/packaging/version.py", line 28, in parse
    return Version(version)
  File "/Users/mvandenb/.pyenv/versions/3.6.9/lib/python3.6/site-packages/packaging/version.py", line 219, in __init__
    match = self._regex.search(version)
TypeError: expected string or bytes-like object
```
2020-02-10 17:15:12 +01:00
mvdbeek 986b752c13 If xml can't be read don't consider it a tool xml file
Fixes
```
  File "..\planemo\venv\lib\site-packages\galaxy\tool_util\loader_directory.py", line 174, in looks_like_xml
    start_contents = f.read(5 * 1024)
  File "..\planemo\venv\lib\encodings\cp1252.py", line 23, in decode
    return codecs.charmap_decode(input,self.errors,decoding_table)[0]
UnicodeDecodeError: 'charmap' codec can't decode byte 0x9d in position 1713: character maps to <undefined>
```

Still weird that this is cp1252 though.
2020-02-10 16:57:11 +01:00
John Chilton 217b78fd5b Merge pull request #9344 from nsoranzo/default_python3_venv
Create Python3 virtualenv by default
2020-02-10 09:12:14 -05:00
John Chilton cf7d449c89 Merge pull request #9332 from guerler/workflow_editor_node
Replacing Workflow Editor Node with Vue-component
2020-02-10 09:08:05 -05:00
Björn Grüning d5405585fe Merge pull request #9273 from guerler/list_icons
Add icons to dropdowns in dataset and workflow list
2020-02-09 21:20:40 +01:00
Björn Grüning d19ac99d3e Merge pull request #9337 from mvdbeek/various_python3_fixes
[20.01] Various python 3 fixes from sentry
2020-02-09 21:11:52 +01:00
guerler 566f6c6feb Merge branch 'dev' into list_icons 2020-02-09 12:12:32 -05:00
Nicola Soranzo e209777066 Python3: decode the output of `subprocess.check_output()` 2020-02-09 16:03:28 +00:00
guerler ea84cbb59b Add missing clearfix to workflow node wrapper 2020-02-08 22:53:04 -05:00