diff --git a/pre_commit_hooks/detect_aws_credentials.py b/pre_commit_hooks/detect_aws_credentials.py index f727078..4c51546 100644 --- a/pre_commit_hooks/detect_aws_credentials.py +++ b/pre_commit_hooks/detect_aws_credentials.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import argparse import os -from six.moves import configparser # pylint: disable=import-error +from six.moves import configparser def get_your_keys(credentials_file): diff --git a/pylintrc b/pylintrc deleted file mode 100644 index c905a37..0000000 --- a/pylintrc +++ /dev/null @@ -1,22 +0,0 @@ -[MESSAGES CONTROL] -disable=bad-open-mode,invalid-name,missing-docstring,redefined-outer-name,star-args,locally-disabled,locally-enabled - -[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 - -[SIMILARITIES] -min-similarity-lines=5 -ignore-imports=yes diff --git a/requirements-dev.txt b/requirements-dev.txt index 97343d5..2922ef5 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,9 +1,7 @@ -e . -astroid<1.3.3 coverage flake8 mock pre-commit -pylint<1.4 pytest diff --git a/tests/check_merge_conflict_test.py b/tests/check_merge_conflict_test.py index 8141ade..f1528b2 100644 --- a/tests/check_merge_conflict_test.py +++ b/tests/check_merge_conflict_test.py @@ -12,9 +12,6 @@ from testing.util import get_resource_path from testing.util import write_file -# pylint:disable=unused-argument - - @pytest.yield_fixture def f1_is_a_conflict_file(tmpdir): # Make a merge conflict diff --git a/tox.ini b/tox.ini index 7486ce1..f2ac125 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,6 @@ commands = coverage report --show-missing --fail-under 100 pre-commit install -f --install-hooks pre-commit run --all-files - pylint {[tox]project} testing tests setup.py [testenv:venv] envdir = venv-{[tox]project}