diff --git a/pyproject.toml b/pyproject.toml index f974cd9..93aaca3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "rwa" -version = "0.9.2" +version = "0.9.3" description = "HDF5-based serialization library for Python datatypes" authors = ["François Laurent "] license = "Apache 2.0" @@ -9,10 +9,10 @@ readme = "README.md" [tool.poetry.dependencies] python = ">=3.8,<3.12" six = "^1.16.0" -numpy = "^1.24.3" -scipy = "^1.10.1" -pandas = "^2.0.2" -h5py = "^3.8.0" +numpy = ">=0" +scipy = ">=0" +pandas = ">=0" +h5py = "^3" [tool.poetry.group.dev.dependencies] diff --git a/rwa/pandas.py b/rwa/pandas.py index 8aeea80..6ba0d03 100644 --- a/rwa/pandas.py +++ b/rwa/pandas.py @@ -4,6 +4,7 @@ from .generic import * import warnings import sys +import numpy as np class Python35Warning(DeprecationWarning): pass @@ -163,7 +164,7 @@ class pandas_Int64Index(object): """ __slot__ = () pass - peek_int64index = peek_numerical_index(pandas.Index, lambda a: a.astype(np.int64)) + peek_int64index = peek_numerical_index(pandas.Index, lambda a: np.asarray(a).astype(np.int64)) try: # UInt64Index is missing in 0.17.1 @@ -191,7 +192,7 @@ class pandas_Float64Index(object): """ __slot__ = () pass - peek_float64index = peek_numerical_index(pandas.Index, lambda a: a.astype(np.float64)) + peek_float64index = peek_numerical_index(pandas.Index, lambda a: np.asarray(a).astype(np.float64)) if True: poke_rangeindex = poke([('start','_start'), ('stop','_stop'), ('step','_step'), 'name']) @@ -224,7 +225,7 @@ class pandas_RangeIndex(object): pass def peek_rangeindex(*args, **kwargs): attrs = peek_as_dict(*args, **kwargs) - return pandas.Int64Index( \ + return pandas.Index( \ range( \ attrs.pop('_start', None), \ attrs.pop('_stop', None), \ diff --git a/setup.py b/setup.py index e8adb8b..722b44d 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ setup( name = 'rwa-python', - version = '0.9.2', + version = '0.9.3', description = 'HDF5-based serialization library for Python datatypes', long_description = long_description, url = 'https://github.com/DecBayComp/RWA-python',