opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-31 10:32:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
36,715 Commits 64 Branches 246 Tags
show
Commit Graph
18655 Commits
Author SHA1 Message Date
Dannon Baker 9b24afc592 Update version to 18.09 2018-10-25 14:57:25 -04: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
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
Nicola Soranzo 4dd2ecb13f Fix `make config-validate` 2018-10-23 12:28:47 +01:00
mvdbeek 794d1e03be Fix messed up printing of shed_tool_conf.xml file 
This drops xml_to_string from lib/tool_shed/util/xml_util.py
and uses xml_to_string form lib/galaxy/utils/__init__.py.
Also reduces plain string manipulation of xml structures.
Uses xml.dom.minidom to make xml pretty if necessary.
 2018-10-22 20:37:30 +02:00
guerler 46e56417dd Use hasattr instead of relying on value 2018-10-17 15:08:47 -04:00
mvdbeek 126ee5fe2b Create composite file archives in new_file_path instead of TMP 2018-10-17 11:06:55 +02:00
Nicola Soranzo b9a01761b0 Do not traceback when uploading a TS repo with no changes 
Fix the following traceback when executing `planemo shed_update`:

```
galaxy.web.framework.decorators ERROR 2018-10-15 18:07:38,736 [p:30249,w:1,m:0] [uWSGIWorker1Core1] Uncaught exception in exposed API method:
Traceback (most recent call last):
  File "lib/galaxy/web/framework/decorators.py", line 154, in decorator
    rval = func(self, trans, *args, **kwargs)
  File "lib/galaxy/webapps/tool_shed/api/repositories.py", line 1116, in create_changeset_revision
    new_repo_alert
  File "lib/tool_shed/util/repository_content_util.py", line 64, in upload_tar
    undesirable_files_removed)
  File "lib/tool_shed/util/commit_util.py", line 225, in handle_directory_changes
    message=commit_message)
  File "lib/tool_shed/util/hg_util.py", line 65, in commit_changeset
    raise Exception(error_message)
Exception: Error committing '/opt/galaxy/database/community_files/000/repo_1' to repository: Command '['hg', 'commit', '-u', u'earlhaminst', '-m', u'planemo upload for repository https://github.com/TGAC/earlham-galaxytools/tree/master/tools/TreeBest commit 22231ebc4e5e990c61243a3609b3347cf63fa024', '/opt/galaxy/database/community_files/000/repo_1']' returned non-zero exit status 1
Output was:
nothing changed

127.0.0.1 - - [15/Oct/2018:18:07:38 +0100] "POST /api/repositories/adb5f5c93f827949/changeset_revision HTTP/1.1" 500 - "-" "python-requests/2.18.4"
```
 2018-10-15 20:35:04 +01:00
mvdbeek 0c7cc50e73 Only warn about multi-file zips if we don't keep the compressed archive 2018-10-13 17:49:19 +02:00
mvdbeek 8edb7499c8 Keep xlsx files compressed 
Fixes https://github.com/galaxyproject/galaxy/issues/6849
 2018-10-13 17:37:41 +02:00
Marius van den Beek 01f1f1b95f Merge pull request #6858 from jmchilton/fix_metadata_revert 
[18.09] Revert selective metadata flushing - breaks multiple uploads/outputs.
 2018-10-12 15:44:01 +02:00
Nicola Soranzo 19f716de91 Fix `LocalShell` doctest 
Broken in commit 57a1f19b06 .
 2018-10-12 11:48:17 +01:00
Nicola Soranzo d22f652f91 Merge branch 'release_18.05' into release_18.09 2018-10-12 09:44:18 +01:00
Nicola Soranzo a8fa5a1d4a Merge branch 'release_18.01' into release_18.05 2018-10-12 09:43:01 +01:00
Martin Cech 20f60a5a44 update paramiko dep 2018-10-11 16:15:00 -04:00
John Chilton d791a2c80f Revert selective metadata flushing - seems to break upload changes. 2018-10-11 16:01:45 -04:00
mvdbeek fc28e0bd83 Use long-form options 2018-10-10 14:56:05 +02:00
mvdbeek 57a1f19b06 Fix slurm cli plugin by avoiding shell=True in subprocess 
Fixes the remaining issue in https://github.com/galaxyproject/galaxy/issues/6831#issuecomment-428097520
 2018-10-10 10:12:18 +02:00
mvdbeek 02410b270d Register job monitor as postfork function 
This should fix https://github.com/galaxyproject/galaxy/issues/6831,
and might fix https://github.com/galaxyproject/galaxy/issues/6261.
 2018-10-08 21:33:20 +02:00
Nicola Soranzo c83c5cb784 Change conda channel priority: conda-forge > bioconda 
xref. https://github.com/bioconda/bioconda-utils/issues/330
 2018-10-08 11:02:23 +01:00
Nicola Soranzo b99fedefa8 Update to latest galaxy-lib 
Includes:
- change channel priority ( https://github.com/galaxyproject/galaxy-lib/pull/132 )
- channel cleanup ( https://github.com/galaxyproject/galaxy-lib/pull/136 )
 2018-10-08 10:08:02 +01:00
John Chilton 98a9c86bad Allow testing tags in input collections. 2018-10-06 09:36:41 -04:00
John Chilton 1c4a4ed8cb Merge remote-tracking branch 'galaxyproject/release_18.05' into release_18.09 2018-10-04 11:43:05 -04:00
John Chilton 4a345b99c3 Fix security problems when extracting untrusted tar files. 
Fixes GX-2018-0006.
 2018-10-04 11:32:52 -04:00
Nate Coraor b7187f0e62 Don't delete referenced Datasets when purging users. 2018-10-01 13:25:13 -04:00
Dannon 1a3e9ae173 Merge pull request #6805 from mvdbeek/gunicorn_run_sh_support 
[18.09] Allow starting Galaxy under gunicorn when using galaxy.ini
 2018-10-01 12:12:59 -04:00
mvdbeek 176364ac80 Move gunicorn to dev-requirements 2018-10-01 18:07:37 +02:00
John Chilton e226edc5ad Merge pull request #6798 from mvdbeek/fix_element_identifier_for_non_multiple_true_mapover_in_conditionals 
[18.09] Fix element identifier for non multiple true mapover in conditionals
 2018-09-30 12:28:21 -04:00
Dannon a47887639d Merge pull request #6803 from mvdbeek/finish_py3_selenium 
[18.09] Fix remaining selenium py3 errors
 2018-09-30 08:28:41 -04:00
mvdbeek 702870c17c Allow starting Galaxy under gunicorn when using galaxy.ini 
and starting Galaxy with `APP_WEBSERVER=gunicorn sh run.sh`.
Additional gunicorn cmdline arguments can be passed using
`GUNICORN_CMD_ARGS`. In a first pass this will allow
running planemo {server, test} under python 3, as Paste
has some problems under python 3:

```
galaxy.web.stack INFO 2018-09-29 22:16:00,216 Galaxy server instance 'main' is running
Traceback (most recent call last):
  File "./scripts/paster.py", line 27, in <module>
    serve.run()
  File "/tmp/tmpv5tow6c8/galaxy-dev/lib/galaxy/util/pastescript/serve.py", line 1055, in run
    invoke(command, command_name, options, args[1:])
  File "/tmp/tmpv5tow6c8/galaxy-dev/lib/galaxy/util/pastescript/serve.py", line 1061, in invoke
    exit_code = runner.run(args)
  File "/tmp/tmpv5tow6c8/galaxy-dev/lib/galaxy/util/pastescript/serve.py", line 226, in run
    result = self.command()
  File "/tmp/tmpv5tow6c8/galaxy-dev/lib/galaxy/util/pastescript/serve.py", line 676, in command
    serve()
  File "/tmp/tmpv5tow6c8/galaxy-dev/lib/galaxy/util/pastescript/serve.py", line 653, in serve
    server(app)
  File "/tmp/tmpv5tow6c8/galaxy-dev/lib/galaxy/util/pastescript/loadwsgi.py", line 232, in server_wrapper
    **context.local_conf)
  File "/tmp/tmpv5tow6c8/galaxy-dev/lib/galaxy/util/pastescript/loadwsgi.py", line 90, in fix_call
    val = callable(*args, **kw)
  File "/home/travis/.planemo/gx_venv_3_release_18.09/lib/python3.6/site-packages/paste/httpserver.py", line 1353, in server_runner
    for name, value in kwargs.items():
RuntimeError: dictionary changed size during iteration
```

That said gunicorn is a nice pure-python alternative to paste going
forward.
 2018-09-30 13:18:21 +02:00
mvdbeek 2e7adfbee4 Cast to bytestring in md5 function 2018-09-29 15:28:12 +02:00
Dannon Baker f0131eff8b Merge remote-tracking branch 'upstream/release_18.05' into release_18.09 2018-09-29 08:21:52 -04:00
Dannon de794dd905 Merge pull request #6774 from mvdbeek/fix_old_wf_name 
[18.05] Update name of Workflow when updating StoredWorkflow name
 2018-09-29 07:57:54 -04:00
mvdbeek f8d9a9e33a Attempt to recover wrapper datasets 
Otherwise we create new wrappers that lack the element identifier.
 2018-09-29 11:39:07 +02:00
mvdbeek 73f8f3129b Partially fix missing element identifier 
This makes sure that any toplevel `|__identifier__` is passed on
to nested inputs.
 2018-09-29 11:39:07 +02:00
Dannon a29c1e47a7 Merge pull request #6799 from natefoo/better-object-store-logging 
[18.09] Provide a useful exception message for object store exceptions
 2018-09-28 15:40:10 -04:00
Nate Coraor 5bc3b2e16c Provide a useful exception message for object store exceptions. 2018-09-28 14:13:09 -04:00
Dannon Baker 1e7677c3b2 Merge remote-tracking branch 'upstream/release_18.05' into release_18.09 2018-09-28 12:49:17 -04:00
Dannon Baker 9bc37c03b6 Merge remote-tracking branch 'upstream/release_18.01' into release_18.05 2018-09-28 12:48:42 -04:00
Dannon Baker ac46d21ece Merge remote-tracking branch 'upstream/release_17.09' into release_18.01 2018-09-28 12:46:20 -04:00
Dannon Baker 40cecf6ff4 Merge remote-tracking branch 'upstream/release_17.05' into release_17.09 2018-09-28 12:43:36 -04:00
Dannon Baker c4150d2002 Merge remote-tracking branch 'upstream/release_17.01' into release_17.05 2018-09-28 12:38:23 -04:00
Dannon Baker fa7f2a4f5c Merge remote-tracking branch 'upstream/release_16.10' into release_17.01 2018-09-28 12:37:49 -04:00
Dannon Baker 809ae58c52 Merge remote-tracking branch 'upstream/release_16.07' into release_16.10 2018-09-28 12:37:20 -04:00