Merge branch 'master' into excel_style

analyticalmonk · Apr 19, 2017 · a5d51f9 · a5d51f9
2 parents 934df06 + f114af0
commit a5d51f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/doc/source/style.ipynb b/doc/source/style.ipynb
@@ -838,7 +838,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())"
    ]

diff --git 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):