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

fixed bug where pd.NA was being cast to NaN during formatting #55754

Merged
merged 13 commits into from
Nov 7, 2023
Merged

fixed bug where pd.NA was being cast to NaN during formatting #55754

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b648389
fixed bug where pd.NA was being cast to NaN during formatting
dominiquegarmier Oct 29, 2023
1efa677
implementing suggestion by Richard Shadrach
dominiquegarmier Oct 30, 2023
1c4d435
added test
dominiquegarmier Oct 31, 2023
331ea63
typo
dominiquegarmier Oct 31, 2023
560197d
Merge branch 'main' into main
dominiquegarmier Oct 31, 2023
b23a481
running pre-commit
dominiquegarmier Oct 31, 2023
518b12c
Merge branch 'main' of github.com:DominiqueGarmier/pandas
dominiquegarmier Oct 31, 2023
6017dcc
this is more efficient
dominiquegarmier Nov 1, 2023
722abaa
implemented using numpy
dominiquegarmier Nov 2, 2023
2520356
Merge branch 'main' into main
dominiquegarmier Nov 2, 2023
03b39d6
Merge branch 'main' into main
dominiquegarmier Nov 3, 2023
bf0d1b1
changed test size from 100 to 10
dominiquegarmier Nov 3, 2023
e7b7e02
Merge branch 'main' into main
dominiquegarmier Nov 3, 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
8 changes: 5 additions & 3 deletions pandas/io/formats/format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,9 +696,11 @@ def _truncate_vertically(self) -> None:
assert self.max_rows_fitted is not None
row_num = self.max_rows_fitted // 2
if row_num >= 1:
head = self.tr_frame.iloc[:row_num, :]
tail = self.tr_frame.iloc[-row_num:, :]
self.tr_frame = concat((head, tail))
_len = len(self.tr_frame)
rows = np.arange(_len)
self.tr_frame = self.tr_frame.iloc[
(rows < row_num) | (rows >= _len - row_num)
dominiquegarmier marked this conversation as resolved.
Show resolved Hide resolved
]
else:
row_num = cast(int, self.max_rows)
self.tr_frame = self.tr_frame.iloc[:row_num, :]
Expand Down
9 changes: 9 additions & 0 deletions pandas/tests/io/formats/test_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,15 @@ def test_repr_truncation(self):
with option_context("display.max_colwidth", max_len + 2):
assert "..." not in repr(df)

def test_repr_truncation_preserves_na(self):
# https://github.com/pandas-dev/pandas/issues/55630
with option_context("display.max_rows", 10):
Copy link
Member

Choose a reason for hiding this comment

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

If you set this to 2 instead of 10, I think we could then test for the entire string.

df = DataFrame({"A": [pd.NA for _ in range(100)]})

r = repr(df)
for row in r.split("\n")[1:-2]:
assert row.endswith(("<NA>", "..."))

def test_max_colwidth_negative_int_raises(self):
# Deprecation enforced from:
# https://github.com/pandas-dev/pandas/issues/31532
Expand Down
Loading