From fe1c3fbdd9d0cc98fddec87f36dfb202f1807907 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 9 Apr 2013 20:24:54 -0400 Subject: [PATCH] BF: fixing incorrect merge conflict -- run coverage only for 2.7 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a92df23a..f685ee38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,6 @@ install: - if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install -q coveralls; fi script: - if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then export PYTHONPATH="$PYTHONPATH:/usr/share/pyshared:/usr/lib/pyshared/python2.7"; fi - - if [[ $TRAVIS_PYTHON_VERSION == 2.[6-7] ]]; then coverage run --rcfile=.travis_coveragerc bin/fail2ban-testcases; else python bin/fail2ban-testcases; fi + - if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then coverage run --rcfile=.travis_coveragerc bin/fail2ban-testcases; else python bin/fail2ban-testcases; fi after_script: - if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then coveralls; fi