Skip to content

Backward compatibility fix for pandas indices #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
francoislaurent merged 15 commits into from
Jun 2, 2023
Merged

Backward compatibility fix for pandas indices #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a331435
fixes #3
francoislaurent May 31, 2023
2d612fa
bug fixes
francoislaurent May 31, 2023
143ade9
excess_records argument to peek and handler
francoislaurent May 31, 2023
0b3827f
cross version ok for scipy
francoislaurent May 31, 2023
fdac0af
version increment
francoislaurent May 31, 2023
db617a8
py 3.6 dropped in ci
francoislaurent May 31, 2023
9b126a2
attempt to make py 3.10 ci work
francoislaurent May 31, 2023
ef1d66e
py 3.7 dropped in ci
francoislaurent May 31, 2023
ae8e565
windows dropped in ci
francoislaurent May 31, 2023
b604d13
dtype test skipped to reintroduce windows in ci
francoislaurent May 31, 2023
120ee67
bugfix in tests
francoislaurent May 31, 2023
eb45d16
drop coverage
francoislaurent May 31, 2023
c3e827b
restore former h5py behavior with homogeneous arrays
francoislaurent Jun 2, 2023
e193c0e
version increment
francoislaurent Jun 2, 2023
776cd1f
Merge branch 'master' into dev
francoislaurent Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <francois.laurent@pasteur.fr>"]
license = "Apache 2.0"
Expand All @@ -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]
Expand Down
7 changes: 4 additions & 3 deletions rwa/pandas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from .generic import *
import warnings
import sys
import numpy as np

class Python35Warning(DeprecationWarning):
pass
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'])
Expand Down Expand Up @@ -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), \
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down