diff --git a/pre_commit/five.py b/pre_commit/five.py index 2ae91c59..5b3732d9 100644 --- a/pre_commit/five.py +++ b/pre_commit/five.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals -# pylint:disable=invalid-name PY2 = str is bytes PY3 = str is not bytes diff --git a/pylintrc b/pylintrc deleted file mode 100644 index e57af29d..00000000 --- a/pylintrc +++ /dev/null @@ -1,19 +0,0 @@ -[MESSAGES CONTROL] -disable=locally-disabled,fixme,missing-docstring,abstract-method,useless-else-on-loop,invalid-name - -[REPORTS] -output-format=colorized -reports=no - -[BASIC] -const-rgx=(([A-Za-z_][A-Za-z0-9_]*)|(__.*__))$ - -[FORMAT] -max-line-length=131 - -[TYPECHECK] -ignored-classes=pytest - -[DESIGN] -min-public-methods=0 - diff --git a/requirements-dev.txt b/requirements-dev.txt index c44b676a..34555411 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,10 +1,8 @@ -e . -astroid<1.3.3 coverage flake8 mock -pylint<1.4 pytest # setuptools breaks pypy3 with extraneous output diff --git a/tests/commands/run_test.py b/tests/commands/run_test.py index d23882e7..f85468ce 100644 --- a/tests/commands/run_test.py +++ b/tests/commands/run_test.py @@ -457,9 +457,9 @@ def test_local_hook_for_stages( config = OrderedDict(( ('repo', 'local'), ('hooks', (OrderedDict(( - ('id', 'pylint'), + ('id', 'flake8'), ('name', 'hook 1'), - ('entry', 'python -m pylint.__main__'), + ('entry', 'python -m flake8.__main__'), ('language', 'system'), ('files', r'\.py$'), ('stages', stage_for_first_hook) @@ -491,9 +491,9 @@ def test_local_hook_passes(repo_with_passing_hook, mock_out_store_directory): config = OrderedDict(( ('repo', 'local'), ('hooks', (OrderedDict(( - ('id', 'pylint'), - ('name', 'PyLint'), - ('entry', 'python -m pylint.__main__'), + ('id', 'flake8'), + ('name', 'flake8'), + ('entry', 'python -m flake8.__main__'), ('language', 'system'), ('files', r'\.py$'), )), OrderedDict(( diff --git a/tox.ini b/tox.ini index e0238cd7..2208a363 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,6 @@ commands = coverage run -m pytest {posargs:tests} # TODO: when dropping py26, change to 100 coverage report --show-missing --fail-under 99 -# pylint {[tox]project} testing tests setup.py pre-commit run --all-files [testenv:venv]