Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 762337e110d7a8d4058d7fcc7fd41147b0d89020 https://github.com/galaxyproject/galaxy/commit/762337e110d7a8d4058d7fcc7fd41... Author: John Chilton jmchilton@gmail.com Date: 2016-10-17 (Mon, 17 Oct 2016)
Changed paths: M lib/galaxy/jobs/metrics/instrumenters/collectl.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/util/object_wrapper.py M lib/galaxy/web/framework/middleware/static.py M lib/galaxy/webapps/galaxy/api/tours.py M lib/galaxy/webapps/galaxy/controllers/userskeys.py M lib/tool_shed/metadata/metadata_generator.py M lib/tool_shed/util/workflow_util.py M test/api/test_histories.py M test/api/test_libraries.py M test/unit/tools/test_tool_dependency_description.py
Log Message: ----------- Fix import orders for updates to flake8_import_order.
Commit: 4bf1994fc3fd09b874c9ea29a8871269d44ad193 https://github.com/galaxyproject/galaxy/commit/4bf1994fc3fd09b874c9ea29a8871... Author: Martin Cech cech.marten@gmail.com Date: 2016-10-17 (Mon, 17 Oct 2016)
Changed paths: M lib/galaxy/jobs/metrics/instrumenters/collectl.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/util/object_wrapper.py M lib/galaxy/web/framework/middleware/static.py M lib/galaxy/webapps/galaxy/api/tours.py M lib/galaxy/webapps/galaxy/controllers/userskeys.py M lib/tool_shed/metadata/metadata_generator.py M lib/tool_shed/util/workflow_util.py M test/api/test_histories.py M test/api/test_libraries.py M test/unit/tools/test_tool_dependency_description.py
Log Message: ----------- Merge pull request #3059 from jmchilton/import_update
Fix import orders for updates to flake8_import_order.
Compare: https://github.com/galaxyproject/galaxy/compare/31cb477e1a53...4bf1994fc3fd