@@ -10,9 +10,15 @@ matrix:
1010 - os : linux
1111 python : 2.7
1212 env : TOXENV=py27
13+ - os : linux
14+ python : 3.6
15+ env : TOXENV=py36
1316 - os : osx
1417 language : generic
1518 env : TOXENV=py27
19+ - os : osx
20+ language : generic
21+ env : TOXENV=py36
1622
1723before_script :
1824 - " export DISPLAY=:99.0"
@@ -24,13 +30,20 @@ before_script:
2430before_install :
2531 # We do this conditionally because it saves us some downloading if the
2632 # version is the same.
27- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
28- wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
29- else
33+ - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
34+ wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
35+ fi
36+ - if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then
37+ wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
38+ fi
39+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
3040 brew update;
3141 brew install python;
32- python --version;
33- wget https://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh -O miniconda.sh;
42+ if [[ "$TOXENV" == "py27" ]]; then
43+ wget https://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh -O miniconda.sh;
44+ else
45+ wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;
46+ fi
3447 fi
3548 - chmod +x miniconda.sh
3649 - bash miniconda.sh -b -p $HOME/miniconda
@@ -46,11 +59,19 @@ install:
4659 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
4760 conda create --yes -n test python=$TRAVIS_PYTHON_VERSION;
4861 else
49- conda create --yes -n test python="2.7";
62+ if [[ "$TOXENV" == "py27" ]]; then
63+ conda create --yes -n test python="2.7";
64+ else
65+ conda create --yes -n test python="3.6";
66+ fi
5067 fi
5168 - source activate test
5269 - pip install numpy scipy matplotlib vtk nose
53- - conda install --yes -c conda-forge -c dlr-sc -c pythonocc -c oce pythonocc-core==0.17.3 python=2
70+ - if [[ "$TOXENV" == "py27" ]]; then
71+ conda install --yes -c conda-forge -c dlr-sc -c pythonocc -c oce pythonocc-core python=2.7;
72+ else
73+ conda install --yes -c conda-forge -c dlr-sc -c pythonocc -c oce pythonocc-core python=3.6;
74+ fi
5475 - pip install setuptools
5576 - pip install coveralls
5677 - pip install coverage
0 commit comments