8000 Merge pull request #12755 from meeseeksmachine/auto-backport-of-pr-12… · matplotlib/matplotlib@64d0564 · GitHub
[go: up one dir, main page]
Skip to content

Commit 64d0564

Browse files
tacaswelltacaswell
authored
Merge pull request #12755 from meeseeksmachine/auto-backport-of-pr-12708-on-v3.0.x
Backport PR #12708 on branch v3.0.x (Run flake8 in a separate travis environment)
2 parents 6224e57 + b0447f8 commit 64d0564

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

‎.travis.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,17 @@ env:
6464
- OPENBLAS_NUM_THREADS=1
6565
- PYTHONFAULTHANDLER=1
6666
- PYTEST_ADDOPTS="-raR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n $NPROC"
67+
- RUN_PYTEST=1
6768
- RUN_FLAKE8=
6869

6970
matrix:
7071
include:
72+
- name: flake8
73+
python: 3.6
74+
env:
75+
- RUN_PYTEST=
76+
- RUN_FLAKE8=1
77+
- EXTRAREQS='-r requirements/testing/travis_flake8.txt'
7178
- python: 3.5
7279
dist: trusty
7380
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124.
@@ -77,7 +84,6 @@ matrix:
7784
env:
7885
- DELETE_FONT_CACHE=1
7986
- EXTRAREQS='-r requirements/testing/travis36.txt'
80-
- RUN_FLAKE8=1
8187
- python: 3.7
8288
sudo: true
8389
- python: "nightly"
@@ -162,8 +168,10 @@ script:
162168
# each script we want to run need to go in it's own section and the program you want
163169
# to fail travis need to be the last thing called
164170
- |
165-
echo "Calling pytest with the following arguments: $PYTEST_ADDOPTS"
166-
python -mpytest
171+
if [[ $RUN_PYTEST == 1 ]]; then
172+
echo "Calling pytest with the following arguments: $PYTEST_ADDOPTS"
173+
python -mpytest
174+
fi
167175
- |
168176
if [[ $RUN_FLAKE8 == 1 ]]; then
169177
flake8 --statistics && echo "Flake8 passed without any issues!"

‎requirements/testing/travis36.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# Extra pip requirements for the travis python 3.6 build
22

3-
flake8
4-
flake8-per-file-ignores
53
ipykernel
64
nbconvert[execute]
75
pandas

‎requirements/testing/travis_flake8.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Extra pip requirements for the travis flake8 build
2+
3+
flake8
4+
flake8-per-file-ignores

0 commit comments

Comments
 (0)
0