Commit Graph
41220 Commits
Author SHA1 Message Date
Sergey Golitsynskiy 17beaef624 Update Sphinx RST files for lib/
Running sphinx 1.8.5 updates all files (one known update: periods are no
longer escaped)
2019-07-05 17:21:31 +02:00
Helena Rasche 0f796740dc Merge pull request #8256 from dannon/tag_min_length
Adjust minimum tag length
2019-07-03 09:02:54 +02:00
Dannon Baker a42e142030 Set minimum tag length to 1, because you do actually need a string here, instead of 2, which in my spelunking seems to be arbitrary. 2019-07-02 17:42:43 -04:00
Marius van den Beek 71d315cf36 Merge pull request #8246 from mvdbeek/merge_8221
Merge 19.05 into dev
2019-06-29 09:24:02 +02:00
Marius van den Beek 49d09e2c45 Merge pull request #8090 from guerler/new_toolshed
Convert repository client to vue
2019-06-29 09:17:36 +02:00
mvdbeek b6e37644e6 Fix one more str(e) 2019-06-29 00:25:08 +01:00
mvdbeek 928f9453e5 Merge branch 'release_19.05' into dev 2019-06-29 00:24:51 +01:00
Aysam GuerlerandMarius van den Beek 0b49fe32d1 Update client/galaxy/scripts/components/Toolshed/RepositoryDetails.vue
Co-Authored-By: Marius van den Beek <m.vandenbeek@gmail.com>
2019-06-28 11:29:46 -04:00
Martin Cech 6d6aec80ee Merge pull request #7811 from dannon/dm-cleanup
Data Manager interface - use standard card header styles without extra markup
2019-06-28 09:46:00 -04:00
John Chilton 747e0c9c4a Merge pull request #8221 from mvdbeek/python2_test_interactor_fix_UnicodeEncodeError
[19.05] Fix UnicodeEncodeError when verifying test results
2019-06-28 05:37:36 -04:00
Marius van den Beek 83ebe453a2 Merge pull request #8225 from mvdbeek/tool_panel_section_label_fix
[19.05] Allow looking up tool section using label
2019-06-28 11:21:44 +02:00
Marius van den Beek 95cbaab03e Merge pull request #8229 from astrovsky01/kallistobus
Kallistobus
2019-06-28 11:18:40 +02:00
Marius van den Beek aa98a29686 Merge pull request #8233 from VJalili/test_base_api
Refactor setup_user_get_key method to return the created test user and its API key
2019-06-28 11:14:36 +02:00
Marius van den Beek feb982cfba Merge pull request #8235 from jmchilton/web_refactor_1
Refactor to cleanup dependencies around galaxy.web.stack.
2019-06-27 20:44:29 +02:00
Marius van den Beek 0db713bf90 Merge pull request #8239 from bernt-matthias/topic/unzip-format
unzip/zip collection: set format equal to input format
2019-06-27 20:41:11 +02:00
M Bernt 1e8605f0ab unzip/zip collection: set format equal to input format 2019-06-27 18:14:34 +02:00
John Chilton 584c117df3 Refactor to cleanup dependencies around galaxy.web.stack.
Move galaxy.web.stack.database_heartbeat into galaxy.model - since it was the only thing in galaxy.web.stack that used galaxy.model at all and it didn't import anything else from galaxy.web.stack.

Once that was done, I refactored this whole package (galaxy.web.stack) into galaxy.web_stack. It doesn't use the framework setup or exported by the base galaxy.web package so it wouldn't seem to belong there. It also has very different dependencies than the rest of that. And finally and most importantly, this elimiantes almost all dependency from galaxy.jobs and galaxy.tools and galaxy.workflows to anything in galaxy.web.
2019-06-26 18:54:52 -04:00
vahid d3cbb985a3 Refactor a test method to return a create test user with its api key. 2019-06-26 12:36:13 -07:00
Nicola Soranzo c090194090 Use unicodify() on exceptions 2019-06-26 19:03:03 +01:00
mvdbeek 92977bb712 Remaining comments from review
Thanks @nsoranzo!
2019-06-26 19:23:02 +02:00
Marius van den BeekandNicola Soranzo a50efe5a78 Apply suggestions from code review
Co-Authored-By: Nicola Soranzo <nicola.soranzo@gmail.com>
2019-06-26 19:06:28 +02:00
mvdbeek 4e714c3b24 Syntax and lint fixes 2019-06-26 19:00:05 +02:00
Marius van den BeekandNicola Soranzo 062ac86b8e Use logging's string substitution via additional arguments III
Co-Authored-By: Nicola Soranzo <nicola.soranzo@gmail.com>
2019-06-26 18:39:52 +02:00
Marius van den BeekandNicola Soranzo 7ced350ef9 Use logging's string substitution via additional arguments II
Co-Authored-By: Nicola Soranzo <nicola.soranzo@gmail.com>
2019-06-26 18:36:53 +02:00
Marius van den BeekandNicola Soranzo c79608d48f Use logging's string substitution via additional arguments
Co-Authored-By: Nicola Soranzo <nicola.soranzo@gmail.com>
2019-06-26 18:25:51 +02:00
Nicola Soranzo 763c664e2a Nicer import formatting 2019-06-26 15:17:50 +01:00
Alexander OSTROVSKY eeee73bda5 changed to kallisto.ec and kallisto.idx 2019-06-26 09:09:21 -04:00
Alexander OSTROVSKY bb11350f9e added datatypes for bustools and kallisto bus 2019-06-26 09:09:21 -04:00
mvdbeek 19d32f8b38 Change most str(e) / str(exc) to unicodify
I skipped migrations and import error exceptions.
2019-06-26 14:57:26 +02:00
mvdbeek 8abe1d9677 Cast all exceptions in galaxy.tools.verify with unicodify 2019-06-26 14:55:49 +02:00
Aysam GuerlerandMarius van den Beek 8aad978d66 Update lib/galaxy/web/base/controller.py
Co-Authored-By: Marius van den Beek <m.vandenbeek@gmail.com>
2019-06-26 03:57:11 -04:00
Nicola Soranzo 8d1b7f847e Use `unicode() to convert non-basestring objects in unicodify()` on Python2 2019-06-25 18:07:03 +01:00
mvdbeek 05a5628df0 Add test for fetching section by label 2019-06-25 18:29:52 +02:00
mvdbeek 64567d856d Allow looking up tool section using label
This is the expected behavior if attempting to install
into a tool panel section that has been defined with a
custom tool_panel_id.
Fixes the issue diagnosed by @natefoo in https://github.com/galaxyproject/usegalaxy-tools/issues/9#issue-452608678
2019-06-25 18:04:15 +02:00
mvdbeek a663b45d1c Fix UnicodeEncodeError when verifying test results
Fixes
```
`Traceback (most recent call last):
  File "/home/dchristiany/.venv/bin/planemo", line 10, in <module>
    sys.exit(planemo())
  File "/home/dchristiany/.venv/local/lib/python2.7/site-packages/click/core.py", line 764, in __call__
    return self.main(*args, **kwargs)
  File "/home/dchristiany/.venv/local/lib/python2.7/site-packages/click/core.py", line 717, in main
    rv = self.invoke(ctx)
  File "/home/dchristiany/.venv/local/lib/python2.7/site-packages/click/core.py", line 1137, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
  File "/home/dchristiany/.venv/local/lib/python2.7/site-packages/click/core.py", line 956, in invoke
    return ctx.invoke(self.callback, **ctx.params)
  File "/home/dchristiany/.venv/local/lib/python2.7/site-packages/click/core.py", line 555, in invoke
    return callback(*args, **kwargs)
  File "/home/dchristiany/.venv/local/lib/python2.7/site-packages/click/decorators.py", line 64, in new_func
    return ctx.invoke(f, obj, *args, **kwargs)
  File "/home/dchristiany/.venv/local/lib/python2.7/site-packages/click/core.py", line 555, in invoke
    return callback(*args, **kwargs)
  File "/home/dchristiany/.venv/local/lib/python2.7/site-packages/planemo/cli.py", line 195, in handle_blended_options
    return f(*args, **kwds)
  File "/home/dchristiany/.venv/local/lib/python2.7/site-packages/planemo/commands/cmd_test.py", line 87, in cli
    test_data = engine.test(runnables)
  File "/home/dchristiany/.venv/local/lib/python2.7/site-packages/planemo/engine/interface.py", line 82, in test
    test_case_data = test_case.structured_test_data(run_response)
  File "/home/dchristiany/.venv/local/lib/python2.7/site-packages/planemo/runnable.py", line 256, in structured_test_data
    self._check_output(output_id, output_value, output_test)
  File "/home/dchristiany/.venv/local/lib/python2.7/site-packages/planemo/runnable.py", line 314, in _check_output
    output_test,
  File "/home/dchristiany/.venv/local/lib/python2.7/site-packages/planemo/test/_check_output.py", line 43, in check_output
    verify_extra_files=None,
  File "/home/dchristiany/.venv/local/lib/python2.7/site-packages/galaxy/tools/verify/__init__.py", line 133, in verify
    errmsg += str(err)
UnicodeEncodeError: 'ascii' codec can't encode character u'\xa0' in position 848: ordinal not in range(128)`
```
which happens on python2 on ` str(u'\xa0')`.
Fixes https://github.com/galaxyproject/planemo/issues/939 (once released
as galaxy-lib)
2019-06-25 16:00:23 +02:00
Nicola Soranzo 48196171cd Merge pull request #8220 from ic4f/dev
Run make config-rebuild to update config/docs
2019-06-25 11:12:35 +01:00
Marius van den Beek 8c7997488f Merge pull request #8207 from jmchilton/fix_datatypes_config
Fix portable metadata datatypes config.
2019-06-25 08:47:41 +02:00
Sergey Golitsynskiy a19bcb5a47 Add reminder to run make config-rebuild
In reference to:
https://github.com/galaxyproject/galaxy/pull/8220#pullrequestreview-253772398
2019-06-25 02:45:16 -04:00
Sergey Golitsynskiy 6f167a2e8d Run make config-rebuild to update config/docs
This is to update galaxy.yml.sample and galaxy_options.rst to be
consistent with the latest update to config_schema.yml (#5651edc)

(generated with make config-rebuild)
2019-06-25 00:18:21 -04:00
Dannon 61e4e17e91 Merge pull request #8213 from jmchilton/fix_os_to_dict
Allow re-populating objectstore from to_dict form.
2019-06-24 13:44:09 -04:00
Nicola Soranzo a625e8fda5 Merge branch 'release_19.05' into dev 2019-06-24 18:29:37 +01:00
Nicola Soranzo 394e0cbcfc [19.05] Quit gsummary script with non-zero exit code upon error (#8214)
[19.05] Quit gsummary script with non-zero exit code upon error
2019-06-24 14:02:57 +01:00
mvdbeek 16e244ad5a Quit gsummary script with non-zero exit code upon error 2019-06-24 11:07:00 +02:00
John Chilton 6c5ac7efc5 Merge pull request #8205 from dannon/prefix-fixes
Fix prefix usage in history copy dialog
2019-06-21 16:41:48 -04:00
Dannon 58a960d105 Merge pull request #8212 from jmchilton/data_tweak
Fix display application inclusion in galaxy-data for set-metadata.
2019-06-21 16:06:57 -04:00
Dannon cc8cb7ba93 Merge pull request #8208 from jmchilton/datatypes_path
Don't check unneeded paths and such when loading datatypes for set_metadata.
2019-06-21 16:03:40 -04:00
John Chilton 768f517acb Merge pull request #8203 from martenson/bp-8163
[19.05] backport of "include parameter name in exceptions"
2019-06-21 15:26:25 -04:00
John Chilton 5cbe33b191 Allow re-populating objectstore from to_dict form.
This was meant for #7110 I think, I'm not sure why I didn't land up actually including it. Needed now for extended metadata collection using galaxy-job-execution package on Pulsar.
2019-06-21 13:05:06 -04:00
Marius van den Beek 2ab2dbbe33 Merge pull request #8186 from veg/19.05
[19.05] Add hyphy_results.json datatype
2019-06-21 18:23:36 +02:00
John Chilton ecea8934e4 Fix display application inclusion in galaxy-data for set-metadata. 2019-06-21 11:53:59 -04:00