Skip to content
Snippets Groups Projects
Commit 9cbe3815 authored by Bert Palm's avatar Bert Palm 🎇
Browse files

fixed dios warnings

parent 2b672e18
No related branches found
No related tags found
2 merge requests!370Release 2.0,!333fixed dios warnings
Pipeline #49207 passed with stage
in 1 minute and 34 seconds
......@@ -128,7 +128,8 @@ class _DiosBase:
raise TypeError("data type not understood")
for k in data:
self._insert(k, pd.Series(data[k], index=index))
s = pd.Series(data[k], index=index, dtype=object).infer_objects()
self._insert(k, s)
# ----------------------------------------------------------------------
# checks
......
#!/usr/bin/env python
import pytest
from .test_setup import *
......@@ -21,6 +23,8 @@ def test__eq__(left, right):
assert res == exp
@pytest.mark.filterwarnings("ignore: invalid value encountered in long_scalars")
@pytest.mark.filterwarnings("ignore: divide by zero encountered in long_scalars")
@pytest.mark.parametrize("left", diosFromMatr(DATA_ALIGNED))
@pytest.mark.parametrize("right", diosFromMatr(DATA_ALIGNED))
@pytest.mark.parametrize("op", OP2)
......@@ -39,6 +43,8 @@ def test__op2__aligningops(left, right, op):
assert res == exp
@pytest.mark.filterwarnings("ignore: invalid value encountered in long_scalars")
@pytest.mark.filterwarnings("ignore: divide by zero encountered in long_scalars")
@pytest.mark.parametrize("left", diosFromMatr(DATA_UNALIGNED))
@pytest.mark.parametrize("right", diosFromMatr(DATA_UNALIGNED))
@pytest.mark.parametrize("op", OPNOCOMP)
......
......@@ -4,7 +4,9 @@ from pandas.core.dtypes.common import is_scalar
pytestmark = pytest.mark.skip
@pytest.mark.parametrize(("idxer", "exp"), [("a", s1), ("c", s3), ("x", pd.Series())])
@pytest.mark.parametrize(
("idxer", "exp"), [("a", s1), ("c", s3), ("x", pd.Series(dtype=float))]
)
def test__getitem_aloc_singleCol(dios_aligned, idxer, exp):
di = dios_aligned.aloc[:, idxer]
assert isinstance(di, pd.Series)
......
......@@ -24,10 +24,10 @@ except ModuleNotFoundError:
import pandas as pd
import numpy as np
a = pd.Series(range(0, 70, 7))
b = pd.Series(range(5, 15, 1))
c = pd.Series(range(7, 107, 10))
d = pd.Series(range(0, 10, 1))
a = pd.Series(range(0, 70, 7), dtype=int)
b = pd.Series(range(5, 15, 1), dtype=int)
c = pd.Series(range(7, 107, 10), dtype=int)
d = pd.Series(range(0, 10, 1), dtype=int)
s1, s2, s3, s4 = a, b, c, d
......@@ -330,8 +330,7 @@ OP1 = list(_OP1_MAP)
def diosFromMatr(mlist):
l = []
for m in mlist:
m = np.array(m)
l.append(DictOfSeries(m.copy()))
l.append(DictOfSeries({i: li.copy() for i, li in enumerate(m)}))
return tuple(l)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment