Commit dad0100c authored by Stefan Behnel's avatar Stefan Behnel

Move pycodestyle config to setup.cfg and constrain the files that it gets applied to.

parent ff75c966
...@@ -1586,10 +1586,12 @@ class TestCodeFormat(unittest.TestCase): ...@@ -1586,10 +1586,12 @@ class TestCodeFormat(unittest.TestCase):
def runTest(self): def runTest(self):
import pycodestyle import pycodestyle
config_file = os.path.join(self.cython_dir, "tox.ini") config_file = os.path.join(self.cython_dir, "setup.cfg")
if not os.path.exists(config_file): if not os.path.exists(config_file):
config_file=os.path.join(os.path.dirname(__file__), "tox.ini") config_file=os.path.join(os.path.dirname(__file__), "setup.cfg")
paths = glob.glob(os.path.join(self.cython_dir, "**/*.py"), recursive=True) paths = []
for codedir in ['Cython', 'Demos', 'docs', 'pyximport', 'tests']:
paths += glob.glob(os.path.join(self.cython_dir, codedir + "/**/*.py"), recursive=True)
style = pycodestyle.StyleGuide(config_file=config_file) style = pycodestyle.StyleGuide(config_file=config_file)
print("") # Fix the first line of the report. print("") # Fix the first line of the report.
result = style.check_files(paths) result = style.check_files(paths)
......
[flake8] [flake8]
exclude = .git,build,__pycache__
max-complexity = 10 max-complexity = 10
max-line-length = 120
[pycodestyle]
exclude = .git,build,__pycache__,venv*,TEST*
max-line-length = 150
format = pylint
select = E711, E714, E501, W291
#ignore = W, E
ignore = ignore =
W504, W504,
# W504 line break after binary operator # W504 line break after binary operator
......
...@@ -10,9 +10,3 @@ envlist = py26, py27, py32, py33, py34, pypy ...@@ -10,9 +10,3 @@ envlist = py26, py27, py32, py33, py34, pypy
setenv = CFLAGS=-O0 -ggdb setenv = CFLAGS=-O0 -ggdb
commands = commands =
{envpython} runtests.py -vv {envpython} runtests.py -vv
[pycodestyle]
ignore = W, E
select = E711, E714, E501, W291
max-line-length = 150
format = pylint
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment