diff options
| author | Ian Cordasco <graffatcolmingov@gmail.com> | 2015-11-23 10:20:42 -0600 |
|---|---|---|
| committer | Ian Cordasco <graffatcolmingov@gmail.com> | 2015-11-23 10:20:42 -0600 |
| commit | 17553e6192af0aef41aeebfe910d51dbe91b6b86 (patch) | |
| tree | f571351ee2ae54a34297864f36b70c4baf88b6ac | |
| parent | 75ad81eb1364ea0e7e7f4b7fea4b2adf71a2646b (diff) | |
| download | flake8-bug/103.tar.gz | |
Add .flake8 to PROJECT_CONFIG for local config filesbug/103
| -rw-r--r-- | CHANGES.rst | 8 | ||||
| -rw-r--r-- | flake8/engine.py | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 785146d..1762334 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,14 @@ CHANGES ======= +2.x.y - 2015-aa-bb +------------------ + +- **Bug** Properly look for ``.flake8`` in current working directory + (`GitLab#103`_) + +.. _GitLab#103: https://gitlab.com/pycqa/flake8/issues/103 + 2.5.0 - 2015-10-26 ------------------ diff --git a/flake8/engine.py b/flake8/engine.py index cfdc269..d8345ad 100644 --- a/flake8/engine.py +++ b/flake8/engine.py @@ -16,6 +16,8 @@ _flake8_noqa = re.compile(r'\s*# flake8[:=]\s*noqa', re.I).search EXTRA_EXCLUDE = ['.tox', '.eggs', '*.egg'] +pep8.PROJECT_CONFIG += ('.flake8',) + def _load_entry_point(entry_point, verify_requirements): """Based on the version of setuptools load an entry-point correctly. |