diff options
author | Florent Xicluna <florent.xicluna@gmail.com> | 2012-12-22 21:47:57 +0100 |
---|---|---|
committer | Florent Xicluna <florent.xicluna@gmail.com> | 2012-12-22 21:47:57 +0100 |
commit | f5ebcd7c8ce440ab9d795413e5b1e29940e360c4 (patch) | |
tree | f7d74519337285bf1fa1a895580b60dbc644fc16 /docs | |
parent | 967e406a99d35274ffb80a606c8b770df6dcc44c (diff) | |
download | pep8-f5ebcd7c8ce440ab9d795413e5b1e29940e360c4.tar.gz |
Load the configuration from tox.ini if present; issue #141
Diffstat (limited to 'docs')
-rw-r--r-- | docs/intro.rst | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/intro.rst b/docs/intro.rst index 44d6411..59698f3 100644 --- a/docs/intro.rst +++ b/docs/intro.rst @@ -169,8 +169,10 @@ Example:: ignore = E226,E302,E41 max-line-length = 160 -At the project level, a ``.pep8`` file or a ``setup.cfg`` file is read -if present. +At the project level, a ``.pep8`` file, a ``tox.ini`` file or a ``setup.cfg`` +file is read if present. Only the first file is considered. If this file +does not have a ``[pep8]`` section, no project specific configuration is +loaded. If the ``ignore`` option is not in the configuration and not in the arguments, only the error codes ``E226`` and ``E241/E242`` are ignored (see below). |