Commit Graph
36749 Commits
Author SHA1 Message Date
Martin Cech 61bda3d11a Merge pull request #6960 from dannon/collection_ext_dl
[18.09] Allow deferring 'to_ext' extension to the server
2018-11-05 10:11:11 -05:00
Nicola Soranzo 2deb302ae7 Merge pull request #6951 from bernt-matthias/topic/test-colouts-backport
[18.09] Backport: tests need to count data sets and collections
2018-11-05 13:43:36 +00:00
mvdbeek 9b42032098 Fill in default state for test_optional_workflow_output 2018-11-05 13:09:31 +01:00
mvdbeek f8b160535c Some minor fixes for the blast datatype
The signature for Data.display_data wasn't quite correct,
and the description of display_data was also a little misleading.
2018-11-05 11:28:45 +01:00
mvdbeek 3be8d66d71 Remove unncecessary implementations of display_data
These were not updated to use `_download_filename`,
and so this fixes the download name for collection elements
to include the element identifier.
Note that the Data class should handle composite data just
fine.
2018-11-05 10:04:52 +01:00
Björn Grüning 3d91738a69 Merge pull request #6955 from dannon/wf_param_fix
[18.09] Fix for workflow parameter collection in workflows view.
2018-11-04 20:58:44 +01:00
Nicola Soranzo 357e2f39c7 Merge branch 'release_18.05' into release_18.09 2018-11-02 14:57:30 +00:00
Martin Cech 6da5157181 Merge pull request #6963 from nsoranzo/release_18.05_allow_rdata.sce_upload
[18.05] Allow upload for ``rdata.sce`` format
2018-11-02 09:33:45 -04:00
Nicola Soranzo 6b5f0a2ad1 Allow upload for `rdata.sce` format 2018-11-02 13:18:15 +00:00
Dannon Baker 69b447169f Allow deferring 'to_ext' extension to the server, implement for collections. 2018-11-01 15:22:52 -04:00
Dannon Baker 18644f91cf Avoid using var; let. 2018-11-01 13:04:54 -04:00
Dannon Baker 03eac8315d Fix for workflow parameter collection in workflows view. 2018-11-01 12:55:04 -04:00
M Bernt 4e098c5d52 tests: add parameter to output_filter 2018-11-01 17:23:17 +01:00
mvdbeek 30aaa296dd Fix sniffing of readname sorted BAM files
This fixes https://github.com/galaxyproject/galaxy/issues/6949.
The problem is that `super` would fall back to the BamInputSorted
sniffer, which prevents sniffing. Includes a test file for the new
datatype upload testing framework.
2018-11-01 12:00:38 -04:00
M Bernt 20cecd2a68 galaxy test needs to count data sets and collection outputs 2018-10-31 12:52:25 +01:00
M Bernt 717605af96 added test 2018-10-31 12:52:25 +01:00
John Chilton 4c7ba6f0fe Merge pull request #6946 from mvdbeek/bam_index_for_coordinate_sorted_only
[18.09] Make Bam index only available for coordinate sorted bam files
2018-10-30 17:29:57 -04:00
mvdbeek 49d9409f00 Bam index is only available for coordinate sorted bam files 2018-10-30 18:09:37 +01:00
Marius van den Beek 1482cacee5 Merge pull request #6886 from ilveroluca/fix/k8s_error_handling
Improve k8s job error handling
2018-10-30 12:01:18 +01:00
Nate Coraor cea9521b1a Merge pull request #6938 from dannon/codeblock_formatting
[18.09] Release announce codeblock formatting fix
2018-10-29 14:52:58 -04:00
Dannon Baker 4dce069209 Adjust code block to try to fix release doc formatting -- I hate RST 2018-10-29 13:00:34 -04:00
Nicola Soranzo d0a93ff628 Merge pull request #6934 from dannon/doc_update
[18.09] Additional 18.09 doc update for toolshed bugfix.
v18.09
2018-10-29 14:11:44 +00:00
Dannon Baker 1fd1848a81 Additional 18.09 bugfix 2018-10-29 09:49:02 -04:00
John Chilton e89f746a07 Merge pull request #6932 from mvdbeek/fix_toolshed_bugs
[18.09] Fix toolshed error in display_tool if tool is invalid
2018-10-29 09:26:30 -04:00
mvdbeek cf2645f9a6 Fix toolshed error in display_tool if tool is invalid
Fixes the following exception:

```
AttributeError: 'NoneType' object has no attribute 'id'
  File "galaxy/web/framework/middleware/sentry.py", line 43, in __call__
    iterable = self.application(environ, start_response)
  File "/srv/toolshed/main/venv/local/lib/python2.7/site-packages/paste/translogger.py", line 69, in __call__
    return self.application(environ, replacement_start_response)
  File "/srv/toolshed/main/venv/local/lib/python2.7/site-packages/paste/recursive.py", line 85, in __call__
    return self.application(environ, start_response)
  File "routes/middleware.py", line 141, in __call__
    response = self.app(environ, start_response)
  File "/srv/toolshed/main/venv/local/lib/python2.7/site-packages/paste/httpexceptions.py", line 640, in __call__
    return self.application(environ, start_response)
  File "galaxy/web/framework/base.py", line 143, in __call__
    return self.handle_request(environ, start_response)
  File "galaxy/web/framework/base.py", line 222, in handle_request
    body = method(trans, **kwargs)
  File "galaxy/webapps/tool_shed/controllers/repository.py", line 888, in display_tool
    tool_state = tool_util.new_state(trans, tool, invalid=False)
  File "tool_shed/util/tool_util.py", line 211, in new_state
    log.debug('Failed to build tool state for tool "%s" using standard method, will try to fall back on custom method: %s', tool.id, e)
```

(from https://sentry.galaxyproject.org/sentry/toolshed/issues/279820/).

Might also fix some other issues when redering workflow svg for
workflows with invalid tools.
2018-10-29 10:34:37 +01:00
Nicola Soranzo 1651238639 Merge pull request #6930 from dannon/index-update
[18.09] Add 18.09_announce to releases index.
2018-10-26 19:28:29 +01:00
Dannon Baker 79cff3ea6b Add 18.09_announce to releases index. 2018-10-26 14:23:08 -04:00
Luca Pireddu c13da94fd7 Fix inverted log message arguments
Thanks @pcm32!
2018-10-26 16:10:29 +02:00
Luca Pireddu cf02c98127 Prefer with open syntax within kubernetes.py 2018-10-26 12:04:43 +02:00
Luca Pireddu e235343f76 Push k8s log IOError handling into __produce_log_file
Handling the IOError within the function should result in other call
sites within the kubernets.py module properly setting the job state even
if the job directory has been removed.
2018-10-26 11:58:44 +02:00
Luca Pireddu c434c27159 Improve k8s runner debug log message 2018-10-26 10:42:23 +02:00
Dannon Baker 9b24afc592 Update version to 18.09 show 2018-10-25 14:57:25 -04:00
Martin Cech 43d9787295 Merge pull request #6923 from dannon/18.09_final_notes
[18.09] Final release notes updates
2018-10-25 12:36:12 -04:00
Nate Coraor 3263aba44a Add a warning to the 18.09 release notes informing admins that job
handling will block until old `new` state jobs have been migrated to a
terminal state.
2018-10-25 12:08:37 -04:00
Dannon Baker 17f4f7955f s/sources/artifacts 2018-10-25 11:58:53 -04:00
Dannon Baker b6e716b289 Correct javascript caps 2018-10-25 10:37:45 -04:00
Dannon Baker 5a71a744ed Add client artifact note 2018-10-25 10:36:38 -04:00
Dannon Baker 6a072ab29d Four more RN PRs. 2018-10-25 10:14:44 -04:00
Nicola Soranzo 843474e5e3 Merge pull request #6915 from mvdbeek/6904_followup
[18.09] Small followup to #6904
2018-10-24 10:37:37 +01:00
mvdbeek 91a9dbaf5c Revert unncessary double logging of exception 2018-10-24 09:50:56 +02:00
mvdbeek c862d55ec8 Use with statement when handling NamedTemporaryFile 2018-10-24 09:50:33 +02:00
John Chilton 328c410fdc Merge pull request #6904 from mvdbeek/fix_weird_xml
[18.09] Fix pretty printing of shed_tool_conf.xml file
2018-10-23 18:51:15 -04:00
John Chilton 3638378569 Merge pull request #6912 from natefoo/fix-drmaa-job-stop
[18.09] Fix stopping DRMAA jobs
2018-10-23 18:43:21 -04:00
Nate Coraor 3f172cc988 Fix job stopping from DRMAA jobs broken in
a1c58a7088 and improve logging around it.
2018-10-23 14:32:26 -04:00
Nicola Soranzo ecb56d80a1 Merge branch 'release_18.05' into release_18.09 2018-10-23 14:28:54 +01:00
mvdbeek 57a4e50d8c Fix capsule export in docker testing
Found this by removing the blank try/except in the previous commit.
This only affects testing when python can't determine the correct
locale and falls back to ASCII.
2018-10-23 15:23:54 +02:00
mvdbeek a465543260 Drop threading lock and global try/except
The Lock wasn't actually preventing anything, and I don't think
anything would need ot be protected here. mkdtemp should be thread-safe.

We also remove the try/except Statement. I think it'd be better to
expose any exceptions here instead of producing broken capsules and
logging an exception.
2018-10-23 15:19:09 +02:00
mvdbeek 8a39f27b3c Fix toolshed tests 2018-10-23 14:51:14 +02:00
John Chilton 1943587034 Merge pull request #6908 from nsoranzo/release_18.09_config_validate
[18.09] Fix ``make config-validate``
2018-10-23 08:51:02 -04:00
Nicola Soranzo 4dd2ecb13f Fix `make config-validate` 2018-10-23 12:28:47 +01:00