Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 713bca04f63f464ccbb47ced90d971624ed075b6 https://github.com/galaxyproject/galaxy/commit/713bca04f63f464ccbb47ced90d97... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-06-12 (Tue, 12 Jun 2018) Changed paths: M lib/galaxy/tools/wrappers.py Log Message: ----------- Allow #if $datasets #end if patern for file lists Otherwise the following exception occurs: ``` Traceback (most recent call last): File "/home/wolffj/src/galaxy/lib/galaxy/jobs/runners/__init__.py", line 191, in prepare_job job_wrapper.prepare() File "/home/wolffj/src/galaxy/lib/galaxy/jobs/__init__.py", line 858, in prepare self.command_line, self.extra_filenames, self.environment_variables = tool_evaluator.build() File "/home/wolffj/src/galaxy/lib/galaxy/tools/evaluation.py", line 435, in build raise e AttributeError: 'DatasetListWrapper' object has no attribute 'value' ``` This is because DatasetListWrapper inherits `__bool__` from ToolParameterValueWrapper which defines bool as ``` def __bool__(self): return bool(self.value) __nonzero__ = __bool__ ``` while DatasetListWrapper has no `value` attribute. Fixes https://github.com/galaxyproject/galaxy/issues/6314 reported by @joachimwolff (many thanks for the detailed report!). Commit: 0a29e533d3362e3a0dd7bfc202e8fff799a9e6ee https://github.com/galaxyproject/galaxy/commit/0a29e533d3362e3a0dd7bfc202e8f... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-06-12 (Tue, 12 Jun 2018) Changed paths: M test/functional/tools/multi_data_optional.xml Log Message: ----------- Use #if $datasets #end if pattern in test tool Commit: 6f213b36975b5b8f66b0b02f8920744a5e2d0064 https://github.com/galaxyproject/galaxy/commit/6f213b36975b5b8f66b0b02f89207... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-06-12 (Tue, 12 Jun 2018) Changed paths: M lib/galaxy/tools/wrappers.py Log Message: ----------- Fix __bool__ for empty optional multidata parameters Commit: 550eb882100a3a9210689dbe789b67a1eb2ba5c2 https://github.com/galaxyproject/galaxy/commit/550eb882100a3a9210689dbe789b6... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-06-12 (Tue, 12 Jun 2018) Changed paths: M test/functional/tools/multi_data_optional.xml Log Message: ----------- Add a test for not providing an optional input Commit: 9b9ab6a1cf4485920c88b252d27642f6f20c3525 https://github.com/galaxyproject/galaxy/commit/9b9ab6a1cf4485920c88b252d2764... Author: Helena Rasche <hxr@hx42.org> Date: 2018-06-12 (Tue, 12 Jun 2018) Changed paths: M lib/galaxy/tools/wrappers.py M test/functional/tools/multi_data_optional.xml Log Message: ----------- Merge pull request #6317 from mvdbeek/fix_6314 Allow #if $datasets #end if pattern for file lists Compare: https://github.com/galaxyproject/galaxy/compare/c08f7c9a4cfd...9b9ab6a1cf44 **NOTE:** This service 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.