@@ -9,20 +9,20 @@ addons:
99matrix :
1010 include :
1111 # # Use the built in venv for linux builds
12- # - os: linux
13- # sudo: required
14- # python: 2.7
12+ - os : linux
13+ sudo : required
14+ python : 2.7
1515 - os : linux
1616 sudo : required
1717 python : 3.5
1818 # # Use generic language for osx
19- # - os: osx
20- # language: generic
21- # env: PYTHON=2.7.10
22- # # Use generic language for osx
23- # - os: osx
24- # language: generic
25- # env: PYTHON=3.5.1
19+ - os : osx
20+ language : generic
21+ env : PYTHON=2.7.10
22+ # Use generic language for osx
23+ - os : osx
24+ language : generic
25+ env : PYTHON=3.5.1
2626# Perform the manual steps on osx to install python3 and activate venv
2727before_install : |
2828 if [ $TRAVIS_OS_NAME == "linux" ]; then
@@ -36,19 +36,19 @@ before_install: |
3636 nvm install 7.2.1
3737 nvm use 7.2.1
3838 npm config set python `which python`
39- # if [ "$TRAVIS_OS_NAME" == "osx" ]; then
40- # brew update;
41- # brew install openssl readline
42- # brew outdated pyenv || brew upgrade pyenv
43- # brew install pyenv-virtualenv
44- # brew install pyenv-virtualenvwrapper
45- # pyenv install $PYTHON
46- # pyenv virtualenv $PYTHON MYVERSION
47- # source ~/.pyenv/versions/MYVERSION/bin/activate
48- # python --version
49- # python -c 'import sys;print(sys.version)'
50- # python -c 'import sys;print(sys.executable)'
51- # fi
39+ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
40+ brew update;
41+ brew install openssl readline
42+ brew outdated pyenv || brew upgrade pyenv
43+ brew install pyenv-virtualenv
44+ brew install pyenv-virtualenvwrapper
45+ pyenv install $PYTHON
46+ pyenv virtualenv $PYTHON MYVERSION
47+ source ~/.pyenv/versions/MYVERSION/bin/activate
48+ python --version
49+ python -c 'import sys;print(sys.version)'
50+ python -c 'import sys;print(sys.executable)'
51+ fi
5252install :
5353# we have this here so we can see where python is installed and hardcode in our tests
5454# else when running npm test, the python version picked is completely different :(
0 commit comments