Merge pull request #1437 from hugovk/pyroma2.6

Skip Pyroma on Python 2.6
This commit is contained in:
wiredfool 2015-09-22 16:10:38 +01:00
commit 86be61b3c6

View File

@ -23,8 +23,8 @@ install:
- "travis_retry pip install cffi" - "travis_retry pip install cffi"
- "travis_retry pip install nose" - "travis_retry pip install nose"
- "travis_retry pip install check-manifest" - "travis_retry pip install check-manifest"
# Pyroma tests sometimes hang on PyPy; skip for PyPy # Pyroma tests sometimes hang on PyPy and Python 2.6; skip for those
- if [ $TRAVIS_PYTHON_VERSION != "pypy" ]; then travis_retry pip install pyroma; fi - if [ $TRAVIS_PYTHON_VERSION != "pypy" && $TRAVIS_PYTHON_VERSION != "2.6" ]; then travis_retry pip install pyroma; fi
- if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then travis_retry pip install unittest2; fi - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then travis_retry pip install unittest2; fi