Skip to content

Commit a5d51f9

Browse files
committed
Merge branch 'master' into excel_style
2 parents 934df06 + f114af0 commit a5d51f9

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

doc/source/style.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@
838838
"\n",
839839
"bigdf.style.background_gradient(cmap, axis=1)\\\n",
840840
" .set_properties(**{'max-width': '80px', 'font-size': '1pt'})\\\n",
841-
" .set_caption(\"Hover to magify\")\\\n",
841+
" .set_caption(\"Hover to magnify\")\\\n",
842842
" .set_precision(2)\\\n",
843843
" .set_table_styles(magnify())"
844844
]

pandas/tests/test_categorical.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -3043,9 +3043,10 @@ def test_pivot_table(self):
30433043
[Categorical(["a", "b", "z"], ordered=True),
30443044
Categorical(["c", "d", "y"], ordered=True)],
30453045
names=['A', 'B'])
3046-
expected = Series([1, 2, np.nan, 3, 4, np.nan, np.nan, np.nan, np.nan],
3047-
index=exp_index, name='values')
3048-
tm.assert_series_equal(result, expected)
3046+
expected = DataFrame(
3047+
{'values': [1, 2, np.nan, 3, 4, np.nan, np.nan, np.nan, np.nan]},
3048+
index=exp_index)
3049+
tm.assert_frame_equal(result, expected)
30493050

30503051
def test_count(self):
30513052

0 commit comments

Comments
 (0)