From 0b22b8df9cb2acac2cf3a51265421b2aecc264ce Mon Sep 17 00:00:00 2001 From: James McBride Date: Wed, 19 Apr 2017 00:33:39 -0700 Subject: [PATCH 1/3] DOC: fix typo magify -> magnify (#16052) --- doc/source/style.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/style.ipynb b/doc/source/style.ipynb index 06763b2a5e741..93323d046d495 100644 --- a/doc/source/style.ipynb +++ b/doc/source/style.ipynb @@ -849,7 +849,7 @@ "\n", "bigdf.style.background_gradient(cmap, axis=1)\\\n", " .set_properties(**{'max-width': '80px', 'font-size': '1pt'})\\\n", - " .set_caption(\"Hover to magify\")\\\n", + " .set_caption(\"Hover to magnify\")\\\n", " .set_precision(2)\\\n", " .set_table_styles(magnify())" ] From 00063d23dd3d36b7bd00f949117022677ba9179a Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Wed, 19 Apr 2017 10:08:44 +0000 Subject: [PATCH 2/3] TST: fix tests xref #13554 (#16054) --- pandas/tests/test_categorical.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pandas/tests/test_categorical.py b/pandas/tests/test_categorical.py index 0594cc9878056..cf0ccb95eabf1 100644 --- a/pandas/tests/test_categorical.py +++ b/pandas/tests/test_categorical.py @@ -3043,9 +3043,10 @@ def test_pivot_table(self): [Categorical(["a", "b", "z"], ordered=True), Categorical(["c", "d", "y"], ordered=True)], names=['A', 'B']) - expected = Series([1, 2, np.nan, 3, 4, np.nan, np.nan, np.nan, np.nan], - index=exp_index, name='values') - tm.assert_series_equal(result, expected) + expected = DataFrame( + {'values': [1, 2, np.nan, 3, 4, np.nan, np.nan, np.nan, np.nan]}, + index=exp_index) + tm.assert_frame_equal(result, expected) def test_count(self): From f114af045f68ed960cba02d234a959301ad97a79 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Wed, 19 Apr 2017 10:20:26 +0000 Subject: [PATCH 3/3] TST: fix tests xref #13554 (#16054)