From 4a7ead88f229da8a4589c9375a5770000e6eb5cf Mon Sep 17 00:00:00 2001
From: vo-va <vo-va@user.noreply.github.com>
Date: Sun, 18 Mar 2018 00:08:22 +0600
Subject: [PATCH] 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
---
 .travis.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f8b7193..4403ea4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,13 @@
 language: python
 cache: pip
 
-#python:
-#  - 2.7
-#  - 3.4
-#  - 3.5
-#  - 3.6
-#  - pypy
-#  - pypy3
+python:
+  - 2.7
+  - 3.4
+  - 3.5
+  - 3.6
+  - pypy
+  - pypy3
 
 matrix:
   include:
@@ -27,9 +27,8 @@ install:
   - if [[ $TRAVIS_OS_NAME == osx && $PYTHON_VERSION == 3 ]]; then brew upgrade python; fi
   - if [[ $TRAVIS_OS_NAME == osx ]]; then brew list openssl &>/dev/null || brew install openssl; fi
   - if [[ $TRAVIS_OS_NAME == osx ]]; then export LDFLAGS="-L$(brew --prefix openssl)/lib" CFLAGS="-I$(brew --prefix openssl)/include"; fi
-  - if [[ $TRAVIS_OS_NAME == osx && $PYTHON_VERSION == 3 ]]; then python3 --version; fi
   - if [[ $TRAVIS_OS_NAME == osx && $PYTHON_VERSION == 3 ]]; then python3 -m venv env; fi
-  - if [[ $TRAVIS_OS_NAME == osx && $PYTHON_VERSION == 2 ]]; then virtualenv --python=python$PYTHON_VERSION env; fi
+  - if [[ $TRAVIS_OS_NAME != osx ]]; then virtualenv --python=python$PYTHON_VERSION env; fi
   - source env/bin/activate
   - make install
   - if [[ $TRAVIS_PYTHON_VERSION == pypy ]]; then pip install lxml==3.8.0; fi