Permalink
Browse files

Revert PR #2279

  • Loading branch information...
1 parent 86ccd88 commit 85922ba1a907fd8160faaababf4f07d4d8beae70 @micbou micbou committed Dec 6, 2016
Showing with 5 additions and 14 deletions.
  1. +5 −7 .travis.yml
  2. +0 −7 ci/travis/travis_script.sh
View
@@ -8,8 +8,7 @@ before_install:
install:
# source because it sets up env vars on some platforms
- source ci/travis/travis_install.sh
-script:
- - ci/travis/travis_script.sh
+script: ./run_tests.py
after_success:
- codecov
env:
@@ -18,14 +17,13 @@ env:
- YCM_CORES=3
- COVERAGE=true
matrix:
- - 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
+ - YCM_PYTHON_VERSION=2.6
+ - YCM_PYTHON_VERSION=2.7
+ - YCM_PYTHON_VERSION=3.3
matrix:
exclude:
- os: osx
- env: YCM_PYTHON_VERSION=2.6 YCM_FLAKE8=false
+ env: YCM_PYTHON_VERSION=2.6
addons:
apt:
sources:
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if [ "${YCM_FLAKE8}" = true ]; then
- ./run_tests.py
-else
- ./run_tests.py --no-flake8
-fi

0 comments on commit 85922ba

Please sign in to comment.