Merge branch 'release/2.14.0'

Author: wolph

.github/stale.yml

@@ -1,5 +1,5 @@
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
+daysUntilStale: 30
 # Number of days of inactivity before a stale issue is closed
 daysUntilClose: 7
 # Issues with these labels will never be considered stale

.travis.yml

@@ -10,10 +10,7 @@ cache:
 env:
 - TOX_ENV=docs
 - TOX_ENV=flake8
-- TOX_ENV=py27-nix
-- TOX_ENV=py34-nix
-- TOX_ENV=py35-nix
-# - TOX_ENV=py36-nix
+- TOX_ENV=py36-nix
 - TOX_ENV=py37-nix
 - TOX_ENV=py38-nix
 - TOX_ENV=py39-nix

README.rst

@@ -2,6 +2,10 @@ numpy-stl
 ==============================================================================
 
 
+.. image:: https://ci.appveyor.com/api/projects/status/cbv7ak2i59wf3lpj?svg=true
+    :alt: numpy-stl test status 
+    :target: https://ci.appveyor.com/project/WoLpH/numpy-stl
+
 .. image:: https://travis-ci.org/WoLpH/numpy-stl.svg?branch=master
     :alt: numpy-stl test status 
     :target: https://travis-ci.org/WoLpH/numpy-stl
@@ -406,3 +410,8 @@ Combining multiple STL files
 
     combined.save('combined.stl', mode=stl.Mode.ASCII)  # save as ASCII
 
+Known limitations
+------------------------------------------------------------------------------
+
+ - When speedups are enabled the STL name is automatically converted to
+ lowercase.

appveyor.yml

@@ -4,37 +4,14 @@ environment:
   # See: http://stackoverflow.com/a/13751649/163740
   # CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
 
+  global:
+    PYTHON: "C:\\Python38-x64\\python.exe"
   matrix:
-    - PYTHON: "C:\\Python27"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "32"
-      TOXENV: py27-windows-32
-
-    - PYTHON: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
-      TOXENV: py27-windows-64
-
-    - PYTHON: "C:\\Python34"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "32"
-      TOXENV: py34-windows-32
-
-    - PYTHON: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "64"
-      TOXENV: py34-windows-64
-      DISTUTILS_USE_SDK: "1"
-
-    - PYTHON: "C:\\Python35"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "32"
-      TOXENV: py35-windows-32
-
-    - PYTHON: "C:\\Python35-x64"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "64"
-      TOXENV: py35-windows-64
+  - TOXENV: py36
+  - TOXENV: py37
+  - TOXENV: py38
+  # not yet available on appveyor
+  # - TOXENV: py39
 
 install:
   # Download setup scripts and unzip
@@ -51,13 +28,20 @@ install:
   # - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
 
   # Check that we have the expected version and architecture for Python
-  - "python --version"
-  - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
+  - "%PYTHON% --version"
+  - "%PYTHON% -c \"import struct; print(struct.calcsize('P') * 8)\""
 
 build: false  # Not a C# project, build stuff at the test step instead.
 
 before_test:
-  - build.cmd %PYTHON%\\python.exe -m pip install tox numpy cython"
+  - "%PYTHON% -m pip install tox numpy cython wheel"
 
 test_script:
-  - build.cmd %PYTHON%\\python.exe -m tox -e %TOXENV%"
+  - "%PYTHON% -m tox -e %TOXENV%"
+
+after_test:
+  - "%PYTHON% setup.py sdist bdist_wheel"
+  - ps: "ls dist"
+
+artifacts:
+  - path: dist\*

stl/__about__.py

@@ -1,6 +1,6 @@
 __package_name__ = 'numpy-stl'
 __import_name__ = 'stl'
-__version__ = '2.13.1'
+__version__ = '2.14.0'
 __author__ = 'Rick van Hattem'
 __author_email__ = '[email protected]'
 __description__ = ' '.join('''

stl/stl.py

@@ -65,32 +65,34 @@ def load(cls, fh, mode=AUTOMATIC, speedups=True):
         if isinstance(header, str):  # pragma: no branch
             header = b(header)
 
-        name = ''
-
-        if mode in (AUTOMATIC, ASCII) and header[:5].lower() == b('solid'):
-            try:
-                name, data = cls._load_ascii(
-                    fh, header, speedups=speedups)
-            except RuntimeError as exception:
-                # Disable fallbacks in ASCII mode
-                if mode is ASCII:
-                    raise
-
-                (recoverable, e) = exception.args
-                # If we didn't read beyond the header the stream is still
-                # readable through the binary reader
-                if recoverable:
-                    name, data = cls._load_binary(fh, header, check_size=False)
-                else:
-                    # Apparently we've read beyond the header. Let's try
-                    # seeking :)
-                    # Note that this fails when reading from stdin, we can't
-                    # recover from that.
-                    fh.seek(HEADER_SIZE)
-
-                    # Since we know this is a seekable file now and we're not
-                    # 100% certain it's binary, check the size while reading
-                    name, data = cls._load_binary(fh, header, check_size=True)
+        if mode is AUTOMATIC:
+            if header.lstrip().lower().startswith(b'solid'):
+                try:
+                    name, data = cls._load_ascii(
+                        fh, header, speedups=speedups)
+                except RuntimeError as exception:
+                    (recoverable, e) = exception.args
+                    # If we didn't read beyond the header the stream is still
+                    # readable through the binary reader
+                    if recoverable:
+                        name, data = cls._load_binary(fh, header,
+                                                      check_size=False)
+                    else:
+                        # Apparently we've read beyond the header. Let's try
+                        # seeking :)
+                        # Note that this fails when reading from stdin, we
+                        # can't recover from that.
+                        fh.seek(HEADER_SIZE)
+
+                        # Since we know this is a seekable file now and we're
+                        # not 100% certain it's binary, check the size while
+                        # reading
+                        name, data = cls._load_binary(fh, header,
+                                                      check_size=True)
+            else:
+                name, data = cls._load_binary(fh, header)
+        elif mode is ASCII:
+            name, data = cls._load_ascii(fh, header, speedups=speedups)
         else:
             name, data = cls._load_binary(fh, header)
 
@@ -231,6 +233,7 @@ def _load_ascii(cls, fh, header, speedups=True):
         else:
             iterator = cls._ascii_reader(fh, header)
             name = next(iterator)
+            print('got name', name)
             return name, numpy.fromiter(iterator, dtype=cls.dtype)
 
     def save(self, filename, fh=None, mode=AUTOMATIC, update_normals=True):
@@ -249,8 +252,17 @@ def save(self, filename, fh=None, mode=AUTOMATIC, update_normals=True):
             self.update_normals()
 
         if mode is AUTOMATIC:
-            if fh and os.isatty(fh.fileno()):  # pragma: no cover
-                write = self._write_ascii
+            # Try to determine if the file is a TTY.
+            if fh:
+                try:
+                    if os.isatty(fh.fileno()):  # pragma: no cover
+                        write = self._write_ascii
+                    else:
+                        write = self._write_binary
+                except IOError:
+                    # If TTY checking fails then it's an io.BytesIO() (or one
+                    # of its siblings from io). Assume binary.
+                    write = self._write_binary
             else:
                 write = self._write_binary
         elif mode is BINARY:
@@ -260,6 +272,13 @@ def save(self, filename, fh=None, mode=AUTOMATIC, update_normals=True):
         else:
             raise ValueError('Mode %r is invalid' % mode)
 
+        if isinstance(fh, io.TextIOBase):
+            # Provide a more helpful error if the user mistakenly
+            # assumes ASCII files should be text files.
+            raise TypeError(
+                "File handles should be in binary mode - even when"
+                " writing an ASCII STL.")
+
         name = os.path.split(filename)[-1]
         try:
             if fh:
@@ -271,7 +290,13 @@ def save(self, filename, fh=None, mode=AUTOMATIC, update_normals=True):
             pass
 
     def _write_ascii(self, fh, name):
-        if _speedups and self.speedups:  # pragma: no cover
+        try:
+            fh.fileno()
+            speedups = self.speedups
+        except io.UnsupportedOperation:
+            speedups = False
+
+        if _speedups and speedups:  # pragma: no cover
             _speedups.ascii_write(fh, b(name), self.data)
         else:
             def p(s, file):
@@ -315,8 +340,16 @@ def _write_binary(self, fh, name):
 
         fh.write(header)
         fh.write(packed)
-        self.data.tofile(fh)
 
+        if isinstance(fh, io.BufferedWriter):
+            # Write to a true file.
+            self.data.tofile(fh)
+        else:
+            # Write to a pseudo buffer.
+            fh.write(self.data.data)
+
+        # In theory this should no longer be possible but I'll leave it here
+        # anyway...
         if self.data.size:  # pragma: no cover
             assert fh.tell() > 84, (
                 'numpy silently refused to write our file. Note that writing '
@@ -403,4 +436,3 @@ def from_files(cls, filenames, calculate_normals=True, mode=Mode.AUTOMATIC,
 
 
 StlMesh = BaseStl.from_file
-

tests/stl_ascii/Cube.stl

@@ -0,0 +1,86 @@
+ solid PRO2STL version 1.0
+ facet normal -1 0 0
+ outer loop 
+ vertex 0 2 2
+ vertex 0 2 0
+ vertex 0 0 0
+ endloop
+ endfacet
+ facet normal -1 0 0
+ outer loop 
+ vertex 0 0 0
+ vertex 0 0 2
+ vertex 0 2 2
+ endloop
+ endfacet
+ facet normal 0 1 -0
+ outer loop 
+ vertex 2 2 2
+ vertex 2 2 0
+ vertex 0 2 0
+ endloop
+ endfacet
+ facet normal -0 1 0
+ outer loop 
+ vertex 0 2 0
+ vertex 0 2 2
+ vertex 2 2 2
+ endloop
+ endfacet
+ facet normal 1 0 0
+ outer loop 
+ vertex 2 0 2
+ vertex 2 0 0
+ vertex 2 2 0
+ endloop
+ endfacet
+ facet normal 1 0 0
+ outer loop 
+ vertex 2 2 0
+ vertex 2 2 2
+ vertex 2 0 2
+ endloop
+ endfacet
+ facet normal 0 -1 0
+ outer loop 
+ vertex 0 0 2
+ vertex 0 0 0
+ vertex 2 0 0
+ endloop
+ endfacet
+ facet normal -0 -1 -0
+ outer loop 
+ vertex 2 0 0
+ vertex 2 0 2
+ vertex 0 0 2
+ endloop
+ endfacet
+ facet normal -0 0 1
+ outer loop 
+ vertex 2 2 2
+ vertex 0 2 2
+ vertex 0 0 2
+ endloop
+ endfacet
+ facet normal 0 -0 1
+ outer loop 
+ vertex 0 0 2
+ vertex 2 0 2
+ vertex 2 2 2
+ endloop
+ endfacet
+ facet normal 0 0 -1
+ outer loop 
+ vertex 2 0 0
+ vertex 0 0 0
+ vertex 0 2 0
+ endloop
+ endfacet
+ facet normal -0 -0 -1
+ outer loop 
+ vertex 0 2 0
+ vertex 2 2 0
+ vertex 2 0 0
+ endloop
+ endfacet
+endsolid PRO2STL version 1.0