Skip to content
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

Jump to bottom

subdtype #247

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

subdtype #247

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
9e47e7a
subdtype
andrewgsavage Jul 31, 2024
09eb285
lint
andrewgsavage Aug 4, 2024
8ec278e
lint
andrewgsavage Aug 4, 2024
0e3a269
tests
andrewgsavage Aug 4, 2024
f3d8f58
get tests working
andrewgsavage Aug 4, 2024
a966311
get tests working
andrewgsavage Aug 4, 2024
91da320
get tests working
andrewgsavage Aug 4, 2024
06f64d3
get tests working
andrewgsavage Aug 4, 2024
c605913
get tests working
andrewgsavage Aug 4, 2024
320901a
get tests working
andrewgsavage Aug 5, 2024
2c6a2a4
docs
andrewgsavage Aug 5, 2024
c93407d
docs
andrewgsavage Aug 5, 2024
7939a26
Trigger Build
andrewgsavage Aug 5, 2024
324f73b
docs
andrewgsavage Aug 5, 2024
c275f34
1darray subdtype
andrewgsavage Aug 26, 2024
e385a0d
1darray subdtype
andrewgsavage Aug 26, 2024
1dcc66d
test more dtypes
andrewgsavage Aug 26, 2024
6180e2a
subdtypes coerce
andrewgsavage Aug 26, 2024
99b4c86
subdtype
andrewgsavage Aug 27, 2024
bc66a5e
subdtype
andrewgsavage Aug 28, 2024
0540dbe
subdtype
andrewgsavage Aug 29, 2024
edb8567
subdtype
andrewgsavage Aug 29, 2024
5eeb788
subdtype
andrewgsavage Aug 29, 2024
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
13 changes: 10 additions & 3 deletions pint_pandas/pint_array.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,15 +864,22 @@ def convert_values(param):
# a TypeError should be raised
res = op(lvalues, rvalues)

subdtype = self.dtype.subdtype
if "truediv" in op.__name__ and subdtype.kind == "i":
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case self can be:

<PintArray>
[1581.2004963851048, 2322.7768972177428, 2065.2759837278822,
 2108.0321074762774,  1922.714515192993]
Length: 5, dtype: pint[USD * percent][float64]

self.dtype is pint[USD * percent][float64] and self.dtype.subdtype is 'float64'. But the string 'float64' does not have a kind attribute.

if isinstance(subdtype, _NumpyEADtype):
subdtype = "float64"
else:
subdtype = "Float64"

if op.__name__ == "divmod":
return (
cls.from_1darray_quantity(res[0], self.dtype.subdtype),
cls.from_1darray_quantity(res[1], self.dtype.subdtype),
cls.from_1darray_quantity(res[0], subdtype),
cls.from_1darray_quantity(res[1], subdtype),
)

if coerce_to_dtype:
try:
res = cls.from_1darray_quantity(res, self.dtype.subdtype)
res = cls.from_1darray_quantity(res, subdtype)
except TypeError:
pass

Expand Down
4 changes: 2 additions & 2 deletions pint_pandas/testsuite/test_issues.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def test_force_ndarray_like(self):

result = pd.concat([a, b], axis=1)
expected = pd.DataFrame(
{0: PintArray(q_a_), 1: PintArray(q_b)}, dtype="pint[degC][Int64]"
{0: PintArray(q_a_), 1: PintArray(q_b)}, dtype="pint[degC][Int32]"
)
tm.assert_equal(result, expected)

Expand All @@ -64,7 +64,7 @@ def test_offset_concat(self):

result = pd.concat([a, b], axis=1)
expected = pd.DataFrame(
{0: PintArray(q_a_), 1: PintArray(q_b)}, dtype="pint[degC][Int64]"
{0: PintArray(q_a_), 1: PintArray(q_b)}, dtype="pint[degC][Int32]"
)
tm.assert_equal(result, expected)

Expand Down
Loading