Skip to content

Run flake8 instead of pep8 on Python 3.6 #10940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Run flake8 instead of pep8 on Python 3.6 #10940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c77587
Run flake8 instead of pep8 on Python 3.6
Apr 2, 2018
369da09
Restore per-file exceptions, fix test_script.sh
May 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@ env:
- PYPARSING=pyparsing
- PYTEST='pytest>=3.4'
- PYTEST_COV=pytest-cov
- PYTEST_PEP8=
- PYTEST_FLAKE8=
- SPHINX=sphinx
# Variables controlling the test run.
- DELETE_FONT_CACHE=
- NO_AT_BRIDGE=1 # Necessary for GTK3 interactive test.
- NPROC=2
- OPENBLAS_NUM_THREADS=1
- PYTHONFAULTHANDLER=1
- PYTEST_ARGS="-rawR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n $NPROC"
- RUN_FLAKE8=
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please move it down (it's in alphabetical order)

- PYTEST_ARGS="-rawR --maxfail=50 --timeout=350 --durations=25 --cov-report= --cov=lib -n $NPROC"
- PYTHON_ARGS=
- RUN_PEP8=

matrix:
include:
Expand All @@ -86,7 +86,7 @@ matrix:
- python: 3.5
env: PYTHON_ARGS=-OO
- python: 3.6
env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_PEP8=pytest-pep8 RUN_PEP8=--pep8
env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_FLAKE8=pytest-flake8 RUN_FLAKE8=--flake8
- python: "nightly"
env: PRE=--pre
- os: osx
Expand Down Expand Up @@ -171,7 +171,7 @@ install:
$PYTEST \
$PYTEST_COV \
pytest-faulthandler \
$PYTEST_PEP8 \
$PYTEST_FLAKE8 \
pytest-rerunfailures \
pytest-timeout \
pytest-xdist
Expand Down
4 changes: 2 additions & 2 deletions ci/travis/test_script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ if [[ $DELETE_FONT_CACHE == 1 ]]; then
rm -rf ~/.cache/matplotlib
fi

echo The following args are passed to pytest $PYTEST_ARGS $RUN_PEP8
echo The following args are passed to pytest $PYTEST_ARGS $RUN_FLAKE8

python -mpytest $PYTEST_ARGS $RUN_PEP8
python -mpytest $PYTEST_ARGS $RUN_FLAKE8
5 changes: 3 additions & 2 deletions pytest.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ markers =
network: Mark a test that uses the network.
style: Set alternate Matplotlib style temporarily.

pep8ignore =
* E111 E114 E115 E116 E121 E122 E123 E124 E125 E126 E127 E128 E129 E131 E226 E240 E241 E242 E243 E244 E245 E246 E247 E248 E249 E265 E266 E704 W503
flake8-max-line-length = 80
flake8-ignore =
* E111 E114 E115 E116 E121 E122 E123 E124 E125 E126 E127 E128 E129 E131 E226 E240 E241 E242 E243 E244 E245 E246 E247 E248 E249 E265 E266 E305 E306 E704 E722 E741 F401 F403 F811 F841 W503

tools/boilerplate.py E501
setup.py E402
Expand Down