-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
ENH: multicol
naive implementation. part2
#43382
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.
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
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
7920037
multirow naive implementation
attack68 8ea7b0c
Merge remote-tracking branch 'upstream/master' into latex_multicol_naive
attack68 b1d8a27
amend tests for siunitx
attack68 c6666ca
Merge remote-tracking branch 'upstream/master' into latex_multicol_naive
attack68 8840b42
Merge remote-tracking branch 'upstream/master' into latex_multicol_naive
attack68 f730cff
ivanovmg req
attack68 49405e7
Merge remote-tracking branch 'upstream/master' into latex_multicol_naive
attack68 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -302,6 +302,35 @@ def test_multiindex_row_and_col(df_ext): | |
assert result == expected | ||
|
||
|
||
@pytest.mark.parametrize( | ||
"multicol_align, siunitx, header", | ||
[ | ||
("naive-l", False, " & A & &"), | ||
("naive-r", False, " & & & A"), | ||
("naive-l", True, "{} & {A} & {} & {}"), | ||
("naive-r", True, "{} & {} & {} & {A}"), | ||
], | ||
) | ||
def test_multicol_naive(df, multicol_align, siunitx, header): | ||
ridx = MultiIndex.from_tuples([("A", "a"), ("A", "b"), ("A", "c")]) | ||
df.columns = ridx | ||
level1 = " & a & b & c" if not siunitx else "{} & {a} & {b} & {c}" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am not a fan of having logic inside tests. |
||
col_format = "lrrl" if not siunitx else "lSSl" | ||
expected = dedent( | ||
f"""\ | ||
\\begin{{tabular}}{{{col_format}}} | ||
{header} \\\\ | ||
{level1} \\\\ | ||
0 & 0 & -0.61 & ab \\\\ | ||
1 & 1 & -1.22 & cd \\\\ | ||
\\end{{tabular}} | ||
""" | ||
) | ||
styler = df.style.format(precision=2) | ||
result = styler.to_latex(multicol_align=multicol_align, siunitx=siunitx) | ||
assert expected == result | ||
|
||
|
||
def test_multi_options(df_ext): | ||
cidx = MultiIndex.from_tuples([("Z", "a"), ("Z", "b"), ("Y", "c")]) | ||
ridx = MultiIndex.from_tuples([("A", "a"), ("A", "b"), ("B", "c")]) | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this
wrap
related tosiunitx
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes. the only time wrap is needed is when
siunitx
is True, but it only applies to columns headers, and not row headers, due to siunitx package establishing display properties for columns