Skip to content

Commit

Permalink
Merge pull request #3125 from certbot/lint-lint
Browse files Browse the repository at this point in the history
Improve user experience for linting.
  • Loading branch information
pde committed Jun 13, 2016
2 parents d386b56 + 91cd191 commit b53b47c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 25 deletions.
6 changes: 0 additions & 6 deletions acme/.pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@ persistent=yes
# usually to register additional checkers.
load-plugins=linter_plugin

# DEPRECATED
include-ids=no

# DEPRECATED
symbols=no

# Use multiple processes to speed up Pylint.
jobs=1

Expand Down
12 changes: 0 additions & 12 deletions pep8.travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,4 @@

set -e # Fail fast

# PEP8 is not ignored in ACME
pep8 --config=acme/.pep8 acme

pep8 \
setup.py \
certbot \
certbot-apache \
certbot-nginx \
certbot-compatibility-test \
letshelp-certbot \
|| echo "PEP8 checking failed, but it's ignored in Travis"

# echo exits with 0
14 changes: 7 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ basepython = python2.7
# duplicate code checking; if one of the commands fails, others will
# continue, but tox return code will reflect previous error
commands =
pip install -e acme[dev] -e .[dev] -e certbot-apache -e certbot-nginx -e certbot-compatibility-test -e letshelp-certbot
pip install -q -e acme[dev] -e .[dev] -e certbot-apache -e certbot-nginx -e certbot-compatibility-test -e letshelp-certbot
./pep8.travis.sh
pylint --rcfile=.pylintrc certbot
pylint --rcfile=acme/.pylintrc acme/acme
pylint --rcfile=.pylintrc certbot-apache/certbot_apache
pylint --rcfile=.pylintrc certbot-nginx/certbot_nginx
pylint --rcfile=.pylintrc certbot-compatibility-test/certbot_compatibility_test
pylint --rcfile=.pylintrc letshelp-certbot/letshelp_certbot
pylint --reports=n --rcfile=.pylintrc certbot
pylint --reports=n --rcfile=acme/.pylintrc acme/acme
pylint --reports=n --rcfile=.pylintrc certbot-apache/certbot_apache
pylint --reports=n --rcfile=.pylintrc certbot-nginx/certbot_nginx
pylint --reports=n --rcfile=.pylintrc certbot-compatibility-test/certbot_compatibility_test
pylint --reports=n --rcfile=.pylintrc letshelp-certbot/letshelp_certbot

[testenv:apacheconftest]
#basepython = python2.7
Expand Down

0 comments on commit b53b47c

Please sign in to comment.