Skip to content

Commit 4a7ead8

Browse files
committed
Changed travis config file to pass tests on osx
brew return error if package already installed - changed scripts to check package installation. For python3 use venv module instead virtualenv
1 parent 842d283 commit 4a7ead8

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

.travis.yml

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
language: python
22
cache: pip
33

4-
#python:
5-
# - 2.7
6-
# - 3.4
7-
# - 3.5
8-
# - 3.6
9-
# - pypy
10-
# - pypy3
4+
python:
5+
- 2.7
6+
- 3.4
7+
- 3.5
8+
- 3.6
9+
- pypy
10+
- pypy3
1111

1212
matrix:
1313
include:
@@ -27,9 +27,8 @@ install:
2727
- if [[ $TRAVIS_OS_NAME == osx && $PYTHON_VERSION == 3 ]]; then brew upgrade python; fi
2828
- if [[ $TRAVIS_OS_NAME == osx ]]; then brew list openssl &>/dev/null || brew install openssl; fi
2929
- if [[ $TRAVIS_OS_NAME == osx ]]; then export LDFLAGS="-L$(brew --prefix openssl)/lib" CFLAGS="-I$(brew --prefix openssl)/include"; fi
30-
- if [[ $TRAVIS_OS_NAME == osx && $PYTHON_VERSION == 3 ]]; then python3 --version; fi
3130
- if [[ $TRAVIS_OS_NAME == osx && $PYTHON_VERSION == 3 ]]; then python3 -m venv env; fi
32-
- if [[ $TRAVIS_OS_NAME == osx && $PYTHON_VERSION == 2 ]]; then virtualenv --python=python$PYTHON_VERSION env; fi
31+
- if [[ $TRAVIS_OS_NAME != osx ]]; then virtualenv --python=python$PYTHON_VERSION env; fi
3332
- source env/bin/activate
3433
- make install
3534
- if [[ $TRAVIS_PYTHON_VERSION == pypy ]]; then pip install lxml==3.8.0; fi

0 commit comments

Comments
 (0)