Auto merge of #2279 - micbou:flake8, r=Valloric
[READY] Disable flake8 for Python 2.6 on Travis See https://github.com/Valloric/ycmd/pull/570. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/valloric/youcompleteme/2279) <!-- Reviewable:end -->
This commit is contained in:
commit
80ae455852
12
.travis.yml
12
.travis.yml
@ -8,16 +8,18 @@ before_install:
|
||||
install:
|
||||
# source because it sets up env vars on some platforms
|
||||
- source ci/travis/travis_install.sh
|
||||
script: ./run_tests.py
|
||||
script:
|
||||
- ci/travis/travis_script.sh
|
||||
env:
|
||||
matrix:
|
||||
- YCM_PYTHON_VERSION=2.7
|
||||
- YCM_PYTHON_VERSION=2.6
|
||||
- YCM_PYTHON_VERSION=3.3
|
||||
- YCM_PYTHON_VERSION=2.7 YCM_FLAKE8=true
|
||||
# Since 3.0.4, Flake8 is not working anymore on Python 2.6.
|
||||
- YCM_PYTHON_VERSION=2.6 YCM_FLAKE8=false
|
||||
- YCM_PYTHON_VERSION=3.3 YCM_FLAKE8=true
|
||||
matrix:
|
||||
exclude:
|
||||
- os: osx
|
||||
env: YCM_PYTHON_VERSION=2.6
|
||||
env: YCM_PYTHON_VERSION=2.6 YCM_FLAKE8=false
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
|
7
ci/travis/travis_script.sh
Executable file
7
ci/travis/travis_script.sh
Executable file
@ -0,0 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [ "${YCM_FLAKE8}" = true ]; then
|
||||
./run_tests.py
|
||||
else
|
||||
./run_tests.py --no-flake8
|
||||
fi
|
Loading…
Reference in New Issue
Block a user