Skip to content

Commit 7c90432

Browse files
committed
simplify travis and conda installation
1 parent 874367a commit 7c90432

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

.travis.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -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
@@ -69,14 +61,12 @@ install:
6961
- echo $LD_LIBRARY_PATH
7062
- echo $DYLD_LIBRARY_PATH
7163
- echo $PATH
72-
- pip install numpy scipy matplotlib vtk nose
64+
- conda install numpy scipy matplotlib vtk nose setuptools coveralls
7365
- if [[ "$TOXENV" == "py27" ]]; then
7466
conda install --yes -c conda-forge -c dlr-sc -c pythonocc -c oce pythonocc-core=0.17 python=2.7;
7567
else
7668
conda install --yes -c conda-forge -c dlr-sc -c pythonocc -c oce pythonocc-core=0.17 python=3.6;
7769
fi
78-
- pip install setuptools
79-
- pip install coveralls
8070
- python setup.py install
8171

8272
script:

0 commit comments

Comments
 (0)