dataiter 0.51__tar.gz → 0.99__tar.gz

{dataiter-0.51 → dataiter-0.99}/PKG-INFO

@@ -1,15 +1,15 @@
 Metadata-Version: 2.1
 Name: dataiter
-Version: 0.51
+Version: 0.99
 Summary: Classes for data manipulation
 Project-URL: Homepage, https://github.com/otsaloma/dataiter
 Author-email: Osmo Salomaa <otsaloma@iki.fi>
 License-Expression: MIT
 License-File: AUTHORS.md
 License-File: COPYING
-Requires-Python: >=3.6.0
+Requires-Python: >=3.9.0
 Requires-Dist: attd>=0.3
-Requires-Dist: numpy<2.0,>=1.7
+Requires-Dist: numpy<3.0,>=2.0
 Requires-Dist: pandas>=1.0
 Requires-Dist: wcwidth>=0.1
 Description-Content-Type: text/markdown

{dataiter-0.51 → dataiter-0.99}/dataiter/__init__.py

@@ -21,10 +21,11 @@
 # THE SOFTWARE.
 
 import contextlib
+import numpy as np
 
 from dataiter import util
 
-__version__ = "0.51"
+__version__ = "0.99"
 
 DEFAULT_PEEK_ELEMENTS = 10
 DEFAULT_PEEK_ITEMS = 3
@@ -39,6 +40,9 @@ PRINT_TRUNCATE_WIDTH = 36
 USE_NUMBA = False
 USE_NUMBA_CACHE = True
 
+if not np.__version__.startswith("2."):
+    raise Exception("NumPy 2.x required")
+
 with contextlib.suppress(LookupError):
     USE_NUMBA_CACHE = util.parse_env_boolean("DATAITER_USE_NUMBA_CACHE")
 
@@ -61,6 +65,7 @@ except LookupError:
 
 globals().pop("check", None)
 globals().pop("contextlib", None)
+globals().pop("np", None)
 globals().pop("numba", None)
 globals().pop("util", None)
 

{dataiter-0.51 → dataiter-0.99}/dataiter/dt.py

@@ -50,7 +50,7 @@ def from_string(x, format):
         return from_string(x, format)[0]
     x = util.sequencify(x)
     assert isinstance(x, np.ndarray)
-    assert np.issubdtype(x.dtype, np.unicode_)
+    assert np.issubdtype(x.dtype, np.str_)
     out = np.full_like(x, None, object)
     out = Vector.fast(out, object)
     na = x == ""

{dataiter-0.51 → dataiter-0.99}/dataiter/test/test_vector.py

@@ -46,7 +46,7 @@ class TestVector:
         assert Vector([np.bool_(True)]).is_boolean()
         assert Vector([np.datetime64(DATE)]).is_datetime()
         assert Vector([np.datetime64(DATETIME)]).is_datetime()
-        assert Vector([np.float_(0.5)]).is_float()
+        assert Vector([np.float64(0.5)]).is_float()
         assert Vector([np.int_(1)]).is_integer()
         assert Vector([np.object_(np)]).is_object()
         assert Vector([np.str_("")]).is_string()

{dataiter-0.51 → dataiter-0.99}/dataiter/vector.py

@@ -78,10 +78,12 @@ class Vector(np.ndarray):
         """
         self._check_dimensions()
 
-    def __array_wrap__(self, array, context=None):
+    def __array_wrap__(self, array, context=None, return_scalar=False):
         # Avoid returning 0-dimensional arrays.
         # https://github.com/numpy/numpy/issues/7403
-        return array[()] if array.shape == () else array
+        if not array.shape or return_scalar:
+            return array.dtype.type(array)
+        return array.view(self.__class__)
 
     def __repr__(self):
         return self.to_string()
@@ -322,7 +324,7 @@ class Vector(np.ndarray):
         """
         Return whether vector data type is string.
         """
-        return np.issubdtype(self.dtype, np.unicode_)
+        return np.issubdtype(self.dtype, np.str_)
 
     def is_timedelta(self):
         """

{dataiter-0.51 → dataiter-0.99}/pyproject.toml

@@ -8,9 +8,9 @@ dynamic = ["version"]
 description = "Classes for data manipulation"
 readme = "README.md"
 license = "MIT"
-requires-python = ">=3.6.0"
+requires-python = ">=3.9.0"
 authors = [{ name = "Osmo Salomaa", email = "otsaloma@iki.fi" }]
-dependencies = ["attd>=0.3", "numpy>=1.7,<2.0", "pandas>=1.0", "wcwidth>=0.1"]
+dependencies = ["attd>=0.3", "numpy>=2.0,<3.0", "pandas>=1.0", "wcwidth>=0.1"]
 
 [project.urls]
 Homepage = "https://github.com/otsaloma/dataiter"