Skip to content

Commit 26fc2bb

Browse files
committed
Merge branch 'release/2.14.1'
2 parents 440e390 + f4939f2 commit 26fc2bb

File tree

10 files changed

+886
-28
lines changed

10 files changed

+886
-28
lines changed

.travis.yml

Lines changed: 62 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,78 @@
11
dist: xenial
22
sudo: false
33
language: python
4-
python: 3.6
5-
cache:
6-
- pip
7-
- directory:
8-
- .tox/dist
9-
- .tox/distshare
4+
105
env:
11-
- TOX_ENV=docs
12-
- TOX_ENV=flake8
13-
- TOX_ENV=py36-nix
14-
- TOX_ENV=py37-nix
15-
- TOX_ENV=py38-nix
16-
- TOX_ENV=py39-nix
6+
global:
7+
- PIP_WHEEL_DIR=$HOME/.wheels
8+
- PIP_FIND_LINKS=file://$PIP_WHEEL_DIR
9+
1710
matrix:
1811
include:
19-
- env: TOX_ENV=py37-nix
20-
python: '3.7-dev'
21-
install: pip install coveralls flake8 tox
22-
# be more verbose not to timeout:
23-
script: tox -vv -e $TOX_ENV
12+
- python: '3.6'
13+
env: TOXENV=docs
14+
- python: '3.6'
15+
env: TOXENV=flake8
16+
- python: '3.5'
17+
env: TOXENV=py35
18+
- python: '3.6'
19+
env: TOXENV=py36
20+
script: tox -vv
21+
- python: '3.7'
22+
env: TOXENV=py37
23+
- python: '3.8'
24+
env: TOXENV=py38
25+
- python: '3.9-dev'
26+
env: TOXENV=py39
27+
# Added power support architecture
28+
- arch: ppc64le
29+
python: '3.6'
30+
env: TOXENV=docs
31+
- arch: ppc64le
32+
python: '3.6'
33+
env: TOXENV=flake8
34+
- arch: ppc64le
35+
python: '3.5'
36+
env: TOXENV=py35
37+
- arch: ppc64le
38+
python: '3.6'
39+
env: TOXENV=py36
40+
- arch: ppc64le
41+
python: '3.7'
42+
env: TOXENV=py37
43+
- arch: ppc64le
44+
python: '3.8'
45+
env: TOXENV=py38
46+
- arch: ppc64le
47+
python: '3.9-dev'
48+
env: TOXENV=py39
49+
50+
cache:
51+
directories:
52+
- $HOME/.wheels
53+
54+
# command to install dependencies, e.g. pip install -r requirements.txt
2455
install:
25-
- pip install -r tests/requirements.txt
26-
- pip install coveralls flake8 tox
27-
- pip install -e .
56+
- mkdir -p $PIP_WHEEL_DIR
57+
- pip wheel -r tests/requirements.txt
58+
- pip install coveralls flake8 tox wheel
59+
- pip install -e .
60+
2861
script:
29-
- tox -e $TOX_ENV
30-
after_success:
31-
- coveralls
32-
- pip install codecov
33-
- codecov
62+
- tox
63+
3464
before_script: flake8 --ignore=W391 stl tests
65+
66+
after_success:
67+
- pip install codecov coveralls
68+
- coveralls
69+
- codecov
70+
3571
notifications:
3672
email:
3773
on_success: never
3874
on_failure: change
75+
3976
deploy:
4077
provider: pypi
4178
user: WoLpH

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,4 +414,4 @@ Known limitations
414414
------------------------------------------------------------------------------
415415

416416
- When speedups are enabled the STL name is automatically converted to
417-
lowercase.
417+
lowercase.

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ test_script:
4040
- "%PYTHON% -m tox -e %TOXENV%"
4141

4242
after_test:
43+
- "%PYTHON% setup.py build_ext --inplace"
4344
- "%PYTHON% setup.py sdist bdist_wheel"
4445
- ps: "ls dist"
4546

stl/__about__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
__package_name__ = 'numpy-stl'
22
__import_name__ = 'stl'
3-
__version__ = '2.14.0'
3+
__version__ = '2.14.1'
44
__author__ = 'Rick van Hattem'
55
__author_email__ = '[email protected]'
66
__description__ = ' '.join('''

stl/stl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ def from_file(cls, filename, calculate_normals=True, fh=None,
379379

380380
@classmethod
381381
def from_multi_file(cls, filename, calculate_normals=True, fh=None,
382-
mode=Mode.ASCII, speedups=True, **kwargs):
382+
mode=Mode.AUTOMATIC, speedups=True, **kwargs):
383383
'''Load multiple meshes from a STL file
384384
385385
Note: mode is hardcoded to ascii since binary stl files do not support

tests/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ pytest-flake8
1414
python-utils
1515
Sphinx
1616
flake8
17+
wheel

0 commit comments

Comments
 (0)