summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lee <IanLee1521@gmail.com>2016-05-31 11:57:01 -0700
committerIan Lee <IanLee1521@gmail.com>2016-05-31 11:57:01 -0700
commitf2ade60c2fd96dd7731d8ec62b3cbe6338823954 (patch)
tree35db4646daa356c8726c762c93d15ae4eec7344a
parent56a9882ec8bea2fe3dc10ab5477187e57468f970 (diff)
downloadpep8-f2ade60c2fd96dd7731d8ec62b3cbe6338823954.tar.gz
Removed project level `.pep8` config file
Closes #364
-rw-r--r--CHANGES.txt1
-rw-r--r--docs/intro.rst5
-rwxr-xr-xpycodestyle.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 4058206..d4b63d0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,7 @@ Changes:
* Added tox test support for Python 3.5 and pypy3
* Added check E275 for whitespace on `from ... import ...` lines; #489 / #491
* Added W503 to the list of codes ignored by default ignore list; #498
+* Removed use of project level `.pep8` configuration file; #364
Bugs:
diff --git a/docs/intro.rst b/docs/intro.rst
index 5a46a02..12f67d7 100644
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -199,9 +199,8 @@ Example::
max-line-length = 160
At the project level, a ``setup.cfg`` file or a ``tox.ini`` file is read if
-present (``.pep8`` file is also supported, but it is deprecated). If none of
-these files have a ``[pep8]`` section, no project specific configuration is
-loaded.
+present. If none of these files have a ``[pep8]`` section, no project specific
+configuration is loaded.
Error codes
diff --git a/pycodestyle.py b/pycodestyle.py
index de40b07..dea67cd 100755
--- a/pycodestyle.py
+++ b/pycodestyle.py
@@ -79,7 +79,7 @@ try:
except ImportError:
USER_CONFIG = None
-PROJECT_CONFIG = ('setup.cfg', 'tox.ini', '.pep8')
+PROJECT_CONFIG = ('setup.cfg', 'tox.ini')
TESTSUITE_PATH = os.path.join(os.path.dirname(__file__), 'testsuite')
MAX_LINE_LENGTH = 79
REPORT_FORMAT = {