Branch: refs/heads/release_16.07 Home: https://github.com/galaxyproject/galaxy Commit: 42a461353bc2dd07f60daf33a42e6d45ec7c86a8 https://github.com/galaxyproject/galaxy/commit/42a461353bc2dd07f60daf33a42e6... Author: John Chilton jmchilton@gmail.com Date: 2016-12-21 (Wed, 21 Dec 2016)

Changed paths: M tools/filters/gff/gff_filter_by_attribute.py M tools/filters/gff/gff_filter_by_feature_count.py

Log Message: ----------- Fix linting of 16.07 broken with security patches.

Commit: 69fe5ae83ae53cb84a2d0bdd9ea53389b8af5a3a https://github.com/galaxyproject/galaxy/commit/69fe5ae83ae53cb84a2d0bdd9ea53... Author: John Chilton jmchilton@gmail.com Date: 2016-12-21 (Wed, 21 Dec 2016)

Changed paths: M tox.ini

Log Message: ----------- Fix 16.07 linting of imports broken with release of flake8-import-order 0.11.

This is pinned to 0.11 in release_16.10 and unpinned in dev, when merging forward keep these "forward" branches the same (i.e. do not revert to flake8-import-order 0.10).

Commit: b400a15c78faba3b873ecf1ce2237c36bc24f440 https://github.com/galaxyproject/galaxy/commit/b400a15c78faba3b873ecf1ce2237... Author: Martin Cech cech.marten@gmail.com Date: 2016-12-23 (Fri, 23 Dec 2016)

Changed paths: M tools/filters/gff/gff_filter_by_attribute.py M tools/filters/gff/gff_filter_by_feature_count.py M tox.ini

Log Message: ----------- Merge pull request #3352 from jmchilton/1607_lintfixes

[16.07] Attempt to fix TravisCI for release 16.07.

Compare: https://github.com/galaxyproject/galaxy/compare/8b75305c49c3...b400a15c78fa