Skip to content

Commit 306ff1d

Browse files
cclaussQuLogic
cclauss
authored andcommitted
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 28c4cfe commit 306ff1d

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ env:
6060
# still supported; this is tested by the first matrix entry.
6161
- PYTEST='pytest>=3.6'
6262
- PYTEST_COV=pytest-cov
63-
- PYTEST_PEP8=
63+
- PYTEST_FLAKE8=
6464
- PYTEST_TIMEOUT=pytest-timeout
6565
- SPHINX=sphinx
6666
# Variables controlling the build.
@@ -74,8 +74,8 @@ env:
7474
- NPROC=2
7575
- OPENBLAS_NUM_THREADS=1
7676
- PYTHONFAULTHANDLER=1
77-
- PYTEST_ADDOPTS="-rawR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n $NPROC"
78-
- RUN_PEP8=
77+
- PYTEST_ADDOPTS="-rawR --maxfail=50 --timeout=350 --durations=25 --cov-report= --cov=lib -n $NPROC"
78+
- RUN_FLAKE8=
7979

8080
matrix:
8181
include:
@@ -100,8 +100,8 @@ matrix:
100100
- DELETE_FONT_CACHE=1
101101
- PANDAS='pandas<0.21.0'
102102
- JUPYTER='jupyter'
103-
- PYTEST_PEP8=pytest-pep8
104-
- PYTEST_ADDOPTS="$PYTEST_ADDOPTS --pep8"
103+
- PYTEST_FLAKE8=pytest-flake8
104+
- PYTEST_ADDOPTS="$PYTEST_ADDOPTS --flake8"
105105
- python: "nightly"
106106
env: PRE=--pre
107107
- os: osx
@@ -182,7 +182,7 @@ install:
182182
$PYTEST \
183183
$PYTEST_COV \
184184
pytest-faulthandler \
185-
$PYTEST_PEP8 \
185+
$PYTEST_FLAKE8 \
186186
pytest-rerunfailures \
187187
$PYTEST_TIMEOUT \
188188
pytest-xdist

pytest.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ 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-ignore =
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 E305 E306 E704 E722 E741 F401 F403 F811 F841 W503
1212

1313
setup.py E402
1414
setupext.py E301 E302 E501

0 commit comments

Comments
 (0)