Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 8edb7499c8d336d727fa751a2097d0356cf5bcbe https://github.com/galaxyproject/galaxy/commit/8edb7499c8d336d727fa751a2097d... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-10-13 (Sat, 13 Oct 2018) Changed paths: M lib/galaxy/datatypes/binary.py Log Message: ----------- Keep xlsx files compressed Fixes https://github.com/galaxyproject/galaxy/issues/6849 Commit: 0c7cc50e73827ac65eabf10400c90a644a15f10b https://github.com/galaxyproject/galaxy/commit/0c7cc50e73827ac65eabf10400c90... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-10-13 (Sat, 13 Oct 2018) Changed paths: M lib/galaxy/datatypes/upload_util.py Log Message: ----------- Only warn about multi-file zips if we don't keep the compressed archive Commit: 03073ed1249d2403994013d9f4486f85d7a23e80 https://github.com/galaxyproject/galaxy/commit/03073ed1249d2403994013d9f4486... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-10-15 (Mon, 15 Oct 2018) Changed paths: M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/upload_util.py Log Message: ----------- Merge pull request #6867 from mvdbeek/fix_xlsx_unpacking [18.09] Keep xlsx files compressed Commit: b9a01761b03e4ad4c06e86a1250c2f33e62ae0be https://github.com/galaxyproject/galaxy/commit/b9a01761b03e4ad4c06e86a1250c2... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-10-15 (Mon, 15 Oct 2018) Changed paths: M lib/tool_shed/util/hg_util.py Log Message: ----------- 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" ``` Commit: d4e2f6d59e15bc06b35824201be30e95209596fb https://github.com/galaxyproject/galaxy/commit/d4e2f6d59e15bc06b35824201be30... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-10-15 (Mon, 15 Oct 2018) Changed paths: M lib/tool_shed/util/hg_util.py Log Message: ----------- Merge pull request #6875 from nsoranzo/release_18.09_fix_commit_changeset [18.09] Do not traceback when uploading a TS repo with no changes Commit: d144523f7c29ae03e48045fd1cff47b0efc50305 https://github.com/galaxyproject/galaxy/commit/d144523f7c29ae03e48045fd1cff4... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-10-16 (Tue, 16 Oct 2018) Changed paths: M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/upload_util.py M lib/tool_shed/util/hg_util.py Log Message: ----------- Merge branch 'release_18.09' into dev Compare: https://github.com/galaxyproject/galaxy/compare/519b994d40ef...d144523f7c29 **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.