pre-commit/flake8
1
0
Fork 0
mirror of https://github.com/PyCQA/flake8.git synced 2026-04-04 20:26:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Ian Cordasco 2016-06-25 16:32:26 +00:00
commit fe8c59c113
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flake8/engine.py
View file

@ -18,7 +18,7 @@ _flake8_noqa = re.compile(r'\s*# flake8[:=]\s*noqa', re.I).search
EXTRA_EXCLUDE = ['.tox', '.eggs', '*.egg']
pep8.PROJECT_CONFIG += ('.flake8',)
pep8.PROJECT_CONFIG = ('.flake8',) + pep8.PROJECT_CONFIG
def _load_entry_point(entry_point, verify_requirements):