sofar 1.1.3__tar.gz → 1.1.4__tar.gz

{sofar-1.1.3 → sofar-1.1.4}/CONTRIBUTING.rst

@@ -127,7 +127,7 @@ You can create an html report on the test `coverage <https://coverage.readthedoc
 Writing the Documentation
 -------------------------
 
-Sofar follows the `numpy style guide <https://numpydoc.readthedocs.io/en/latest/format.html>`_ for the docstring. A docstring has to consist at least of
+Sofar follows the `numpy style guide <https://numpydoc.readthedocs.io/en/stable/format.html>`_ for the docstring. A docstring has to consist at least of
 
 - A short and/or extended summary,
 - the Parameters section, and

{sofar-1.1.3 → sofar-1.1.4}/HISTORY.rst

@@ -1,6 +1,10 @@
 History
 =======
 
+1.1.4 (2024-06-15)
+------------------
+* Update for numpy 2.0 (PR #100)
+
 1.1.3 (2024-3-15)
 -----------------
 * Update documentation to pydata theme (PR #78)

{sofar-1.1.3 → sofar-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sofar
-Version: 1.1.3
+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.3 → sofar-1.1.4}/README.rst

@@ -43,7 +43,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.3 → sofar-1.1.4}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.3
+current_version = 1.1.4
 commit = True
 tag = True
 

{sofar-1.1.3 → sofar-1.1.4}/setup.py

@@ -67,7 +67,7 @@ setup(
         "Documentation": "https://sofar.readthedocs.io/",
         "Source Code": "https://github.com/pyfar/sofar",
     },
-    version='1.1.3',
+    version='1.1.4',
     zip_safe=False,
     python_requires='>=3.8'
 )

{sofar-1.1.3 → sofar-1.1.4}/sofar/__init__.py

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

{sofar-1.1.3 → sofar-1.1.4}/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-1.1.3 → sofar-1.1.4}/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.3 → sofar-1.1.4}/sofar.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sofar
-Version: 1.1.3
+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.3 → sofar-1.1.4}/tests/test_sofa_verify.py

@@ -192,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"