Skip to content

Commit

Permalink
Merge pull request #146 from aloetesting/fix-warnings
Browse files Browse the repository at this point in the history
Fix Pylint warnings
  • Loading branch information
koterpillar committed Aug 5, 2018
2 parents 4e79a25 + 9c118c7 commit 69506b2
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 11 deletions.
18 changes: 12 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
language: python

python:
- "2.7"
- "3.4"
- "3.5"
- "3.6"
matrix:
include:
- python: "3.6"
env: PYLINT_FLAGS=
- python: "3.5"
env: PYLINT_FLAGS=
- python: "3.4"
env: PYLINT_FLAGS=
- python: "2.7"
env: PYLINT_FLAGS="--disable bad-continuation"

install:
- pip install -r requirements.txt
- pip install -r test_requirements.txt
- pip install --upgrade pycodestyle pylint
- pip install coveralls

cache:
Expand All @@ -17,7 +23,7 @@ cache:

script:
- pycodestyle .
- pylint aloe aloe_sphinx tests
- pylint $PYLINT_FLAGS aloe aloe_sphinx tests
- coverage erase
- coverage run -m nose
- coverage report
Expand Down
7 changes: 6 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ environment:

matrix:
- PYTHON: "C:\\Python36-x64"
PYLINT_FLAGS: ""
- PYTHON: "C:\\Python35-x64"
PYLINT_FLAGS: ""
- PYTHON: "C:\\Python34-x64"
PYLINT_FLAGS: ""
- PYTHON: "C:\\Python27"
PYLINT_FLAGS: "--disable bad-continuation"

install:
- git config core.symlinks true
Expand All @@ -16,12 +20,13 @@ install:
- python -m easy_install -U setuptools
- pip install -r requirements.txt
- pip install -r test_requirements.txt
- pip install --upgrade pycodestyle pylint

build: off

test_script:
- pycodestyle .
- pylint aloe aloe_sphinx tests
- pylint %PYLINT_FLAGS% aloe aloe_sphinx tests
- coverage erase
- coverage run -m nose
- coverage report
Expand Down
1 change: 1 addition & 0 deletions pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ disable=
no-self-use,
too-few-public-methods,
too-many-lines,
useless-object-inheritance,
unused-argument,
wrong-import-order,
RP0101,
Expand Down
2 changes: 1 addition & 1 deletion test_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ coverage
factory_boy
mock
pycodestyle
pylint>=1.8.0
pylint>=1.9.3
setuptools_scm
Sphinx
6 changes: 3 additions & 3 deletions tests/integration/test_simple.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ def read(file_desc):
return data

with set_environ(
COLORTERM='',
TERM='xterm-256color',
TERM_PROGRAM='',
COLORTERM='',
TERM='xterm-256color',
TERM_PROGRAM='',
):

status = pty.spawn(args, read) # pylint:disable=assignment-from-no-return
Expand Down

0 comments on commit 69506b2

Please sign in to comment.