Merge branch 'release/2.16.0'

Author: wolph

.gitattributes

@@ -0,0 +1,3 @@
+# force CRLF line endings for dos test file
+tests/stl_tests/dos.stl text eol=crlf
+

.travis.yml

@@ -1,5 +1,4 @@
 dist: xenial
-sudo: false
 language: python
 
 env:
@@ -20,6 +19,9 @@ matrix:
       env: TOXENV=py37
     - python: '3.8'
       env: TOXENV=py38
+      # before_install:
+      #   - sudo apt update
+      #   - sudo apt install -y xcb xvfb libxcb-xinerama0
     - python: '3.9'
       env: TOXENV=py39
   # Added power support architecture
@@ -70,11 +72,11 @@ notifications:
     on_failure: change
 
 deploy:
+  distributions: bdist_wheel
   provider: pypi
   user: WoLpH
   password:
     secure: HVxDUJ6ns7G7xypuibu01ruDfO4orV5lNr1Mor003MX3HVivvKsTwWqY5K1J+J+C4mgK6ahyvanD5GahYvcWia/Y2xeH2VnytnAgo+W3AI+h72+1oaRpvQHynJ7Fz6Mc0zad0GcbQh3QuA7Pu3IOWs7buUL+MQM6d9QLTkerOvs=
   on:
     tags: true
-    distributions: bdist_wheel
     repo: WoLpH/numpy-stl

setup.py

@@ -108,6 +108,7 @@ def run(self):
         url=about['__url__'],
         license='BSD',
         packages=['stl'],
+        package_data={about['__import_name__']: ['py.typed']},
         long_description=long_description,
         tests_require=tests_require,
         entry_points={

stl/__about__.py

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

stl/_speedups.pyx

@@ -107,7 +107,6 @@ def ascii_read(fh, buf):
         cdef locale_t new_locale = newlocale(LC_NUMERIC_MASK, 'C',
                                              <locale_t>NULL)
         cdef locale_t old_locale = uselocale(new_locale)
-        freelocale(new_locale)
 
     try:
         state.size = len(buf)
@@ -167,9 +166,9 @@ def ascii_read(fh, buf):
             fclose(state.fp)
             fh.seek(pos, SEEK_SET)
 
-    IF UNAME_SYSNAME == 'Linux':
-        uselocale(old_locale)
-        freelocale(old_locale)
+        IF UNAME_SYSNAME == 'Linux':
+            uselocale(old_locale)
+            freelocale(new_locale)
 
 
 def ascii_write(fh, name, np.ndarray[Facet, mode = 'c', cast=True] arr):

stl/base.py

@@ -491,6 +491,15 @@ def rotate(self, axis, theta=0, point=None):
         self.rotate_using_matrix(self.rotation_matrix(axis, theta), point)
 
     def rotate_using_matrix(self, rotation_matrix, point=None):
+        '''
+        Rotate using a given rotation matrix and optional rotation point
+
+        Note that this rotation produces clockwise rotations for positive
+        angles which is arguably incorrect but will remain for legacy reasons.
+        For more details, read here:
+        https://github.com/WoLpH/numpy-stl/issues/166
+        '''
+
         identity = numpy.identity(rotation_matrix.shape[0])
         # No need to rotate if there is no actual rotation
         if not rotation_matrix.any() or (identity == rotation_matrix).all():

stl/py.typed

@@ -1,5 +1,6 @@
 import os
 import sys
+import locale
 import pytest
 import pathlib
 import warnings
@@ -97,6 +98,21 @@ def test_scientific_notation(tmpdir, speedups):
         assert test_mesh.name == b(name)
 
 
+@pytest.mark.skipif(sys.platform.startswith('win'),
+                    reason='Only makes sense on Unix')
+def test_locale_restore(speedups):
+    if not speedups:
+        pytest.skip('Only makes sense with speedups')
+
+    old_locale = locale.nl_langinfo(locale.CODESET)
+
+    filename = FILES_PATH / 'bwb.stl'
+    mesh.Mesh.from_file(filename, speedups=speedups)
+
+    new_locale = locale.nl_langinfo(locale.CODESET)
+    assert old_locale == new_locale
+
+
 @pytest.mark.skipif(sys.platform.startswith('win'),
                     reason='Only makes sense on Unix')
 def test_use_with_qt_with_custom_locale_decimal_delimeter(speedups):

tests/test_ascii.py

@@ -27,8 +27,8 @@ commands=
     sphinx-build -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
 # sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
 
-[testenv:py36]
-# one optional test has PyQt5 dep, only test that once
-deps = 
-    -rtests/requirements.txt
-    PyQt5
+# [testenv:py38]
+# # one optional test has PyQt5 dep, only test that once
+# deps = 
+#     -rtests/requirements.txt
+#     PyQt5