delta/python-packages/flake8.git, branch 2.6.1

Bump version for 2.6.1

2016-06-25T16:37:24+00:00

Merge branch 'prefer-.flake8' into 'master'

2016-06-25T16:32:26+00:00


Prefer `.flake8` if present for options.

If somebody explicitly has a `.flake8` file, presumably they intend to put flake8 configuration in it, so prefer it to the generic `setup.cfg` and `tox.ini` from pycodestyle.


See merge request !63

Prefer `.flake8` if present for options.

2016-06-21T14:57:52+00:00

If somebody explicitly has a `.flake8` file, presumably they intend to
put flake8 configuration in it, so prefer it to the generic `setup.cfg`
and `tox.ini` from pycodestyle.

Merge branch 'readthedocs.io' of adamchainz/flake8

2016-06-16T00:31:38+00:00

Merge branch 'master' of mpenkov/flake8

2016-06-16T00:31:10+00:00

Merge branch 'patch-1' of pinguin999/flake8

2016-06-16T00:30:08+00:00

Convert readthedocs links for their .org -> .io migration for hosted projects

2016-06-15T20:57:11+00:00

As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.

Update mock.patch to use pycodestyle as well

2016-06-15T18:39:38+00:00

Merge branch 'merge-request/60'

2016-06-15T17:17:04+00:00

Merge branch 'use-pycodestyle' from IanLee1521

2016-06-15T17:10:05+00:00

I've merged this into a local branch which I'll then merge into master

Conflicts:
      setup.py