Skip to content

Commit 48445dd

Browse files
committed
run travis on 3.7 and eat sphinx output on docs build
1 parent d7e3168 commit 48445dd

4 files changed

Lines changed: 23 additions & 8 deletions

File tree

.travis.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ python:
77
- '3.4'
88
- '3.5'
99
- '3.6'
10+
- '3.7'
1011

1112
before_deploy:
1213
- pip install -r docs/requirements.txt
@@ -69,13 +70,15 @@ install:
6970
- source activate test-environment
7071

7172
# only install the basic version of the library to make sure
72-
# trimesh imports with only the minimal install
73+
# trimesh imports and functions with only the minimal install
7374
- pip install .
75+
76+
# install testing stuff
7477
- pip install pytest pytest-cov coveralls
7578

7679
script:
7780

78-
# try simple tests with only 3 minimal deps
81+
# try simple tests with only minimal deps
7982
- python -c "import trimesh"
8083
- pytest tests/test_inertia.py
8184

@@ -88,6 +91,8 @@ script:
8891

8992
# install most deps here
9093
- pip install .[easy]
94+
95+
# xxhash only has linux wheels and triangle is compiled
9196
- pip install triangle xxhash
9297

9398
# run main tests
@@ -101,7 +106,7 @@ script:
101106

102107
# make sure examples still work
103108
- cd examples
104-
- for f in *py*; do python ../tests/notebook_run.py exec "$f"; done
109+
- for f in *py*; do python ../tests/notebooks.py exec "$f"; done
105110
- cd ..
106111

107112
after_success:

docs/build.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"""
99

1010
import os
11+
import sys
1112
import shutil
1213
import inspect
1314
import subprocess
@@ -38,6 +39,9 @@ def abspath(rel):
3839
# output location for all the html
3940
build_dir = abspath('html')
4041

42+
# sphinx produces a lot of output
43+
verbose = '-v' in sys.argv
44+
4145
if __name__ == '__main__':
4246
# convert README to an RST for sphinx
4347
pdc = ['pandoc',
@@ -55,7 +59,7 @@ def abspath(rel):
5559
except FileExistsError:
5660
pass
5761
exp = ['python',
58-
abspath('../tests/notebook_run.py'),
62+
abspath('../tests/notebooks.py'),
5963
'examples',
6064
examples_dir]
6165
subprocess.check_call(exp)
@@ -73,15 +77,21 @@ def abspath(rel):
7377
'-o',
7478
cwd,
7579
abspath('../trimesh')]
76-
subprocess.check_call(api)
77-
7880
# build the HTML docs
7981
bld = ['sphinx-build',
8082
'-b',
8183
'html',
8284
cwd,
8385
build_dir]
84-
subprocess.check_call(bld)
86+
87+
if verbose:
88+
# sphinx produces a ton of useless output
89+
subprocess.check_call(api)
90+
subprocess.check_call(bld)
91+
else:
92+
print('running sphinx, eating output')
93+
subprocess.check_output(api, stderr=subprocess.DEVNULL)
94+
subprocess.check_output(bld, stderr=subprocess.DEVNULL)
8595

8696
# keep github pages from using jekyll
8797
with open(os.path.join(build_dir, '.nojekyll'), 'w') as f:

trimesh/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '2.33.28'
1+
__version__ = '2.33.29'

0 commit comments

Comments
 (0)