Branch: refs/heads/master Home: https://github.com/galaxyproject/galaxy Commit: 33c4025fabc057a412c2da662b3606afc0726902 https://github.com/galaxyproject/galaxy/commit/33c4025fabc057a412c2da662b360... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-08-10 (Wed, 10 Aug 2016) Changed paths: M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py Log Message: ----------- Fix misplaced parenthesis Reported by @dpryan79 in https://github.com/galaxyproject/tools-iuc/issues/906#issuecomment-238844304 Commit: f4cb63d6f27f68814bd6131f43c1eee6fa8d099e https://github.com/galaxyproject/galaxy/commit/f4cb63d6f27f68814bd6131f43c1e... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-08-10 (Wed, 10 Aug 2016) Changed paths: M .ci/flake8_blacklist.txt M tox.ini Log Message: ----------- Pin flake8 version Do not pin when forward-merging to dev branch. Also ignore .tox/ and eggs/ as in #2650 . Commit: 68f718d53bc6bcc44c8ccbe14c79a9fb79c3b9fc https://github.com/galaxyproject/galaxy/commit/68f718d53bc6bcc44c8ccbe14c79a... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-08-10 (Wed, 10 Aug 2016) Changed paths: M .ci/flake8_blacklist.txt M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py M tox.ini Log Message: ----------- Merge pull request #2767 from nsoranzo/release_16.01_handle_complex_repository_dependency_for_package [16.01] Fix misplaced parenthesis Commit: f2f62f340ecd92ebdde51e6d13d5145a6f40cc9e https://github.com/galaxyproject/galaxy/commit/f2f62f340ecd92ebdde51e6d13d51... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-08-10 (Wed, 10 Aug 2016) Changed paths: M .ci/flake8_blacklist.txt M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py M tox.ini Log Message: ----------- Merge branch 'release_16.01' into release_16.04 Conflicts: .ci/flake8_blacklist.txt tox.ini Commit: d24ce8b0a49095637d522a3579cf93470fec7a39 https://github.com/galaxyproject/galaxy/commit/d24ce8b0a49095637d522a3579cf9... Author: guerler <aysam.guerler@gmail.com> Date: 2016-08-12 (Fri, 12 Aug 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Add implicit conversions target extension to hda name when listed as selection option Commit: ceeef39edb5562b1397df19acaf074e8c5412d1b https://github.com/galaxyproject/galaxy/commit/ceeef39edb5562b1397df19acaf07... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-08-12 (Fri, 12 Aug 2016) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Merge pull request #2779 from nsoranzo/release_16.04_backport_2734 [16.04] Backport #2734 Commit: f8cf6f834bd92b82a05250b1c1f0e42957bffb15 https://github.com/galaxyproject/galaxy/commit/f8cf6f834bd92b82a05250b1c1f0e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-08-12 (Fri, 12 Aug 2016) Changed paths: M .ci/flake8_blacklist.txt M lib/galaxy/tools/parameters/basic.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py M tox.ini Log Message: ----------- Merge branch 'release_16.04' Compare: https://github.com/galaxyproject/galaxy/compare/fb76aa0a938a...f8cf6f834bd9