Skip to content

Commit 7552aee

Browse files
author
cclauss
committed
Run flake8 instead of pep8 on Python 3.6
As discussed at #10938 (comment) _undefined names_ have [occurred often in the past](https://github.com/matplotlib/matplotlib/pulls?q=is%3Apr+author%3Acclauss+is%3Aclosed) and this change would help to avoid recurrence in the future.
1 parent 035ea50 commit 7552aee

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ env:
5757
- PYPARSING=pyparsing
5858
- PYTEST='pytest>=3.4'
5959
- PYTEST_COV=pytest-cov
60-
- PYTEST_PEP8=
60+
- PYTEST_FLAKE8=
6161
- SPHINX=sphinx
6262
# Variables controlling the test run.
6363
- DELETE_FONT_CACHE=
6464
- NO_AT_BRIDGE=1 # Necessary for GTK3 interactive test.
6565
- NPROC=2
6666
- OPENBLAS_NUM_THREADS=1
6767
- PYTHONFAULTHANDLER=1
68+
- RUN_FLAKE8=
6869
- PYTEST_ARGS="-rawR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n $NPROC"
6970
- PYTHON_ARGS=
70-
- RUN_PEP8=
7171

7272
matrix:
7373
include:
@@ -86,7 +86,7 @@ matrix:
8686
- python: 3.5
8787
env: PYTHON_ARGS=-OO
8888
- python: 3.6
89-
env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_PEP8=pytest-pep8 RUN_PEP8=--pep8
89+
env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_FLAKE8=pytest-flake8 RUN_FLAKE8=--flake8
9090
- python: "nightly"
9191
env: PRE=--pre
9292
- os: osx
@@ -171,7 +171,7 @@ install:
171171
$PYTEST \
172172
$PYTEST_COV \
173173
pytest-faulthandler \
174-
$PYTEST_PEP8 \
174+
$PYTEST_FLAKE8 \
175175
pytest-rerunfailures \
176176
pytest-timeout \
177177
pytest-xdist

pytest.ini

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ markers =
77
network: Mark a test that uses the network.
88
style: Set alternate Matplotlib style temporarily.
99

10-
pep8ignore =
11-
* 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
10+
flake8-max-line-length = 80
11+
flake8-ignore =
12+
*.py E114 E116 E122 E127 E128 E129 E131 E202 E203 E225 E261 E265 E305 E722 E741 F401 F403 F811 F841
1213

1314
tools/boilerplate.py E501
1415
setup.py E402

0 commit comments

Comments
 (0)