Skip to content

Commit d8d3ca5

Browse files
committed
switch to travis matrix
1 parent ac00399 commit d8d3ca5

1 file changed

Lines changed: 20 additions & 18 deletions

File tree

.travis.yml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
1-
language: python
1+
# we are using miniconda python
2+
language: generic
23
sudo: required
34
dist: xenial
45

5-
python:
6-
- '2.7'
7-
- '3.4'
8-
- '3.5'
9-
- '3.6'
10-
- '3.7'
6+
matrix:
7+
include:
8+
- env: PYTHON_VERSION=2.7
9+
- env: PYTHON_VERSION=3.4
10+
- env: PYTHON_VERSION=3.5
11+
- env: PYTHON_VERSION=3.6
12+
- env: PYTHON_VERSION=3.7
1113

1214
before_deploy:
1315
- pip install -r docs/requirements.txt
1416
- python docs/build.py
1517

1618
# extract the current trimesh version from the version file
17-
- export TMVERSION=`python -c "exec(open('trimesh/version.py','r').read()); print(__version__)"`
19+
- export TM_VERSION=`python -c "exec(open('trimesh/version.py','r').read()); print(__version__)"`
1820

1921
# tag the release and if it's already tagged chill
20-
- git tag $TMVERSION || true
22+
- git tag $TM_VERSION || true
2123

2224
deploy:
2325
- provider: pypi
2426
user: mikedh
2527
on:
26-
python: '3.6'
28+
condition: $PYTHON_VERSION = '3.6'
2729
branch: master
2830
password:
2931
secure: MmFES9M+UZbfpQsWeSVlhgUcdbpCymaeJwExxcyJbkKKWdRoZLRusqCmTdQ7Rai8DxH++ooqgEnHwq+D9e/8Y0jbbFBScPbJVeNFj1B4xV36NlyV8A0027/UTuhvkhoUv/xP6mN4TfuC3tWEj5m20DQlibjjxS154r/BlA6/kic=
@@ -35,7 +37,7 @@ deploy:
3537
target-branch: gh-pages
3638
local-dir: docs/html
3739
on:
38-
python: '3.6'
40+
condition: $PYTHON_VERSION = '3.6'
3941
branch: master
4042

4143
- provider: releases
@@ -45,18 +47,18 @@ deploy:
4547
# tarballs which are what people would want anyway
4648
file: "README.md"
4749
on:
48-
python: '3.6'
50+
condition: $PYTHON_VERSION = '3.6'
4951
branch: master
5052

5153
before_install:
52-
- sudo apt-get update
53-
- sudo apt-get install -y openscad blender meshlab xvfb pandoc
54+
- sudo apt-get -qq update
55+
- sudo apt-get -qq -y install openscad blender meshlab xvfb pandoc
5456
- sudo wget https://github.com/mikedh/v-hacd-1/raw/master/bin/linux/testVHACD --quiet
5557
-P /usr/bin
5658
- sudo chmod +x /usr/bin/testVHACD
5759

5860
install:
59-
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then wget --quiet https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
61+
- if [[ "$PYTHON_VERSION" == "2.7" ]]; then wget --quiet https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
6062
-O miniconda.sh; else wget --quiet https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
6163
-O miniconda.sh; fi
6264
- bash miniconda.sh -b -p $HOME/miniconda
@@ -66,7 +68,7 @@ install:
6668
- conda config --add channels conda-forge
6769
- conda update -q conda
6870
- conda info -a
69-
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION nomkl numpy scipy
71+
- conda create -q -n test-environment python=$PYTHON_VERSION nomkl numpy scipy
7072
- source activate test-environment
7173

7274
# only install the basic version of the library to make sure
@@ -86,8 +88,8 @@ script:
8688
- conda install scikit-image rtree shapely
8789

8890
# pyembree and python-fcl not available everywhere
89-
- if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then conda install pyembree; fi;
90-
- if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then pip install python-fcl; fi;
91+
- if [[ "$PYTHON_VERSION" == "3.6" ]]; then conda install pyembree; fi;
92+
- if [[ "$PYTHON_VERSION" == "3.6" ]]; then pip install python-fcl; fi;
9193

9294
# install most deps here
9395
- pip install .[easy]

0 commit comments

Comments
 (0)