From d0e9c2da51191cd58df8895d4df6adc76ab1d459 Mon Sep 17 00:00:00 2001 From: Matt Jia Date: Mar 29 2017 23:41:18 +0000 Subject: use pylint instead of flake8 --- diff --git a/pylint.rc b/pylint.rc new file mode 100644 index 0000000..14ab04a --- /dev/null +++ b/pylint.rc @@ -0,0 +1,4 @@ +[MESSAGES CONTROL] +# pylint gets confused by SQLAlchemy so we disable E1101 and E1103 to keep the +# noise down. +disable=I,R,C,W,E1101,E1103 diff --git a/requirements.txt b/requirements.txt index a201a83..21144ec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,6 +10,7 @@ kerberos >= 1.1.1 pytest >= 2.4.2 mock +pylint # Documentation requirements sphinx diff --git a/tox.ini b/tox.ini index d57b02a..bba19a5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = lint,py27,py34,py35,py36,docs +envlist = pylint,py27,py34,py35,py36,docs # If the user is missing an interpreter, don't fail skip_missing_interpreters = True @@ -14,8 +14,6 @@ commands = [testenv:docs] changedir = docs -deps = - -rrequirements.txt whitelist_externals = mkdir rm @@ -24,13 +22,6 @@ commands= rm -rf _build/ sphinx-build -W -b html -d {envtmpdir}/doctrees . _build/html -[testenv:lint] -deps = - flake8 > 3.0 +[testenv:pylint] commands = - python -m flake8 {posargs} - -[flake8] -show-source = True -max-line-length = 100 -exclude = .git,.tox,dist,*egg + pylint --rcfile=pylint.rc waiverdb --reports=n diff --git a/waiverdb/logger.py b/waiverdb/logger.py index 58932f3..9714dc4 100644 --- a/waiverdb/logger.py +++ b/waiverdb/logger.py @@ -25,7 +25,7 @@ def log_to_stdout(app, level=logging.INFO): def log_to_journal(app, level=logging.INFO): try: - import systemd.journal + import systemd.journal # pylint: disable=import-error except: raise ValueError("systemd.journal module is not installed") journal_handler = systemd.journal.JournalHandler() diff --git a/waiverdb/models/__init__.py b/waiverdb/models/__init__.py index 27e8766..5088532 100644 --- a/waiverdb/models/__init__.py +++ b/waiverdb/models/__init__.py @@ -9,5 +9,5 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -from .base import db # noqa: F401 -from .waivers import Waiver # noqa: F401 +from .base import db +from .waivers import Waiver