Skip to content

Commit 6a99201

Browse files
authored
Merge pull request #162 from mtezzele/travis
solving issue osx py36
2 parents defcf36 + 43f3c71 commit 6a99201

File tree

1 file changed

+12
-20
lines changed

1 file changed

+12
-20
lines changed

.travis.yml

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ matrix:
1111
python: 2.7
1212
env: TOXENV=py27
1313
- os: linux
14-
python: 3.6
15-
env: TOXENV=py36
14+
python: 3.5
15+
env: TOXENV=py35
1616
- os: osx
1717
language: generic
1818
env: TOXENV=py27
1919
- os: osx
2020
language: generic
21-
env: TOXENV=py36
21+
env: TOXENV=py35
2222

2323
before_script:
2424
- "export DISPLAY=:99.0"
@@ -30,20 +30,12 @@ before_script:
3030
before_install:
3131
# We do this conditionally because it saves us some downloading if the
3232
# version is the same.
33-
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
33+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
3434
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
35+
else
4036
brew update;
4137
brew install python;
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
38+
wget https://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh -O miniconda.sh;
4739
fi
4840
- chmod +x miniconda.sh
4941
- bash miniconda.sh -b -p $HOME/miniconda
@@ -62,19 +54,19 @@ install:
6254
if [[ "$TOXENV" == "py27" ]]; then
6355
conda create --yes -n test python="2.7";
6456
else
65-
conda create --yes -n test python="3.6";
57+
conda create --yes -n test python="3.5";
6658
fi
6759
fi
6860
- source activate test
69-
- pip install numpy scipy matplotlib vtk nose
61+
- echo $LD_LIBRARY_PATH
62+
- echo $DYLD_LIBRARY_PATH
63+
- echo $PATH
64+
- conda install numpy scipy matplotlib vtk nose setuptools coveralls
7065
- if [[ "$TOXENV" == "py27" ]]; then
7166
conda install --yes -c conda-forge -c dlr-sc -c pythonocc -c oce pythonocc-core=0.17 python=2.7;
7267
else
73-
conda install --yes -c conda-forge -c dlr-sc -c pythonocc -c oce pythonocc-core=0.17 python=3.6;
68+
conda install --yes -c conda-forge -c dlr-sc -c pythonocc -c oce pythonocc-core=0.17 python=3.5;
7469
fi
75-
- pip install setuptools
76-
- pip install coveralls
77-
- pip install coverage
7870
- python setup.py install
7971

8072
script:

0 commit comments

Comments
 (0)