sofar 1.1.2__py2.py3-none-any.whl → 1.1.4__py2.py3-none-any.whl

sofar/__init__.py

@@ -4,7 +4,7 @@
 
 __author__ = """The pyfar developers"""
 __email__ = 'info@pyfar.org'
-__version__ = '1.1.2'
+__version__ = '1.1.4'
 
 from .sofa import Sofa
 

sofar/sofa.py

@@ -73,7 +73,7 @@ class Sofa():
 
 
     For more examples refer to the `Quick tour of SOFA and sofar` at
-    https://sofar.readthedocs.io/en/latest/
+    https://sofar.readthedocs.io/en/stable/
     """
 
     # these have to be set here, because they are used in __setattr__ and
@@ -992,18 +992,17 @@ class Sofa():
                         f"- {key} must be string but is {type(value)}\n"
 
             elif dtype == "double":
-                # multiple checks needed because sofar does not force the user
-                # to initally pass data as numpy arrays
-                if not isinstance(value,
-                                  (np.int_, np.float_, np.double, np.ndarray)):
-                    current_error += (f"- {key} must be int, float or numpy "
-                                      f"array but is {type(value)}\n")
-
-                if isinstance(value, np.ndarray) and not (
-                        str(value.dtype).startswith('int') or
-                        str(value.dtype).startswith('float')):
+                # All variables can be of type float or int, and are converted
+                # to float when writing.
+                # sofar does not force the user to pass data as numpy arrays.
+                # We thus check for allowed instances (int, float, numpy) and
+                # specifically for the type of numpy arrays.
+                if not isinstance(
+                        value, (int, float, np.ndarray, np.number)) or \
+                        (isinstance(value, (np.ndarray, np.number)) and
+                         value.dtype.kind not in ['i', 'f']):
                     current_error += (f"- {key} must be int or float "
-                                      f"but is {type(value.dtype)}\n")
+                                      f"but is {type(value)}\n")
 
             elif dtype == "string":
                 # multiple checks needed because sofar does not force the user

sofar/update_conventions.py

@@ -1,5 +1,6 @@
 import contextlib
 import os
+import re
 import glob
 import json
 import requests
@@ -377,13 +378,9 @@ def _check_congruency(save_dir=None, branch="master"):
 
     # get file names of conventions from github
     url = urls_check[1]
-    page = requests.get(url).json()
-    sofatoolbox = []
-    for content in page["payload"]["tree"]["items"]:
-        if content["contentType"] == "file" and \
-                content["path"].startswith("SOFAtoolbox/conventions") and \
-                content["name"].endswith("csv"):
-            sofatoolbox.append(content["name"])
+    page = requests.get(url).text
+    sofatoolbox = re.findall(
+        r'"SOFAtoolbox/conventions/([^"]+\.csv)"', page)
 
     if not sofatoolbox:
         raise ValueError(f"Did not find any conventions at {url}")

{sofar-1.1.2.dist-info → sofar-1.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sofar
-Version: 1.1.2
+Version: 1.1.4
 Summary: Maybe the most complete python package for SOFA files so far
 Home-page: https://pyfar.org/
 Download-URL: https://pypi.org/project/sofar/
@@ -75,7 +75,7 @@ Refer to the `contribution guidelines`_ for more information.
 .. _sofa_conventions : https://github.com/pyfar/sofa_conventions
 .. _contribution guidelines: https://github.com/pyfar/sofar/blob/develop/CONTRIBUTING.rst
 .. _pyfar.org: https://pyfar.org
-.. _read the docs: https://sofar.readthedocs.io/en/latest
+.. _read the docs: https://sofar.readthedocs.io/en/stable
 .. _sofaconventions.org: https://sofaconventions.org
 
 References

{sofar-1.1.2.dist-info → sofar-1.1.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
-sofar/__init__.py,sha256=RGIpbxH5bVZKn19hx98TkmvdckxJhAWnp1HHSrTq35A,595
+sofar/__init__.py,sha256=ipQxAym8ywA7KcX4SVQOlutZ0fV2cCt7U294geEFmL0,595
 sofar/io.py,sha256=XdkfG6jo4RI8JqUgXEfx2ka06_CfffPJXs0HqeMSri0,15761
-sofar/sofa.py,sha256=QVr0UKr-aqo2K7_PEHtXk9VuvrjE36QgcYIqFJ6KBrc,68255
-sofar/update_conventions.py,sha256=36ba0cAVtKppJCrsEhP2aiv1DGEtxNx06hsUAERDlwM,16753
+sofar/sofa.py,sha256=RxR9JP0U5RXK_b3eyzWAQkYKyLKaKLRh8cwBdnE4hS8,68238
+sofar/update_conventions.py,sha256=AwIihKYk0ZeNnXe_5dawJiMtqcCGSjPcDHwcrAIRiI4,16551
 sofar/utils.py,sha256=0JwYLLyVu1ZcAfUQKSucywcQPlHB2Ojez7fxIXhuaFw,10754
 sofar/sofa_conventions/VERSION,sha256=IuQRql5P3qfPUQuJwuh-RX5TvI_Wd4bDdSm8VLNQqds,34
 sofar/sofa_conventions/conventions/FreeFieldDirectivityTF_1.1.csv,sha256=Wait37FTh6ROKgpX7-JsVM-ohtKfsdHjxVL5vN7uTTs,5510
@@ -65,11 +65,11 @@ tests/test_deprecations.py,sha256=coHOEq5XUquYxRge8XKeg005M84wcgSHTEE--CoEar4,58
 tests/test_io.py,sha256=xMBdWP3vdnk_6aYAhg30nEgGvPfYm30a1qouGHIwRNo,11808
 tests/test_sofa.py,sha256=DpiI517T-gLoajy9nQCHT7ouxM40JwirsqkVMFT5cWo,11314
 tests/test_sofa_upgrade_conventions.py,sha256=HqIuvFFub1_HCH6qHTLPcPyBZ2ayDKzmZR7RwnTxo_o,3377
-tests/test_sofa_verify.py,sha256=cleTkFJurJfDEZrnSTfBYe2VqsCZ1VxWr9efNGjWr88,15631
+tests/test_sofa_verify.py,sha256=W2BbhGn61yM0qwGMlrwUweO6zIcvcL5bcf5KZw1cSTk,15834
 tests/test_utils.py,sha256=yT290xCaeDW4l3DHUeFGiVmLe9xMguETN1NAGRTJ-X4,8307
-sofar-1.1.2.dist-info/AUTHORS.rst,sha256=JGcf9PJwl0w14PgTRjI3HXpcwDbkGbUN4mkYoZ8smL8,164
-sofar-1.1.2.dist-info/LICENSE,sha256=qdGH_RUPveBBfGYShm6OIBd6bRJdwp3fDCpjMsowmqA,1068
-sofar-1.1.2.dist-info/METADATA,sha256=e8jmS10i7hzFk7nLcG5YLzrSKrhahvx7U9sLmMicx6Q,3242
-sofar-1.1.2.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-sofar-1.1.2.dist-info/top_level.txt,sha256=2JSMmeQ5zeMumFynTJU1oODh09wxSiN3gFpsY-bNsSo,12
-sofar-1.1.2.dist-info/RECORD,,
+sofar-1.1.4.dist-info/AUTHORS.rst,sha256=JGcf9PJwl0w14PgTRjI3HXpcwDbkGbUN4mkYoZ8smL8,164
+sofar-1.1.4.dist-info/LICENSE,sha256=qdGH_RUPveBBfGYShm6OIBd6bRJdwp3fDCpjMsowmqA,1068
+sofar-1.1.4.dist-info/METADATA,sha256=OkEVBU87yhOOj9g-osLcFSsjd_vCP2dJ12RcfTaBwJM,3242
+sofar-1.1.4.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+sofar-1.1.4.dist-info/top_level.txt,sha256=2JSMmeQ5zeMumFynTJU1oODh09wxSiN3gFpsY-bNsSo,12
+sofar-1.1.4.dist-info/RECORD,,

{sofar-1.1.2.dist-info → sofar-1.1.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

tests/test_sofa_verify.py

@@ -6,6 +6,7 @@ from glob import glob
 import pytest
 from pytest import raises
 import numpy as np
+import warnings
 
 # get verification rules
 _, unit_aliases, _, _ = sf.Sofa._verification_rules()
@@ -82,19 +83,25 @@ def test_issue_handling(capfd):
         sf.Sofa._verify_handle_issues(
             warning_msg, error_msg + "error", issue_handling)
 
-    # report warning
-    issue_handling = "report"
-    with pytest.warns(None) as warning:
+    # print warning
+    issue_handling = "print"
+    with warnings.catch_warnings():
+        warnings.simplefilter('error')
         _, issues = sf.Sofa._verify_handle_issues(
             warning_msg + "warning", error_msg, issue_handling)
+    out, _ = capfd.readouterr()
     assert "warning" in issues
+    assert 'warning' in out
     assert "ERROR" not in issues
-    assert len(warning) == 0
-    # report error
+    assert "ERROR" not in out
+    # print error
     _, issues = sf.Sofa._verify_handle_issues(
             warning_msg, error_msg + "error", issue_handling)
+    out, _ = capfd.readouterr()
     assert "error" in issues
+    assert 'error' in out
     assert "WARNING" not in issues
+    assert "WARNING" not in out
 
     # test invalid data for netCDF attribute
     issue_handling = "ignore"
@@ -185,11 +192,11 @@ def test_data_types(capfd):
         sofa.verify()
 
     sofa.Data_IR = "1"
-    with raises(ValueError, match="- Data_IR must be int, float"):
+    with raises(ValueError, match="- Data_IR must be int or float"):
         sofa.verify()
 
     sofa.Data_IR = 1+1j
-    with raises(ValueError, match="- Data_IR must be int, float"):
+    with raises(ValueError, match="- Data_IR must be int or float"):
         sofa.verify()
 
     # test invalid data with issue_handling "print" and "return"