Merge branches

Author: tp

pandas/tests/reshape/test_concat.py

@@ -834,13 +834,14 @@ def test_append_preserve_index_name(self):
     @pytest.mark.parametrize("df_columns", [
         pd.RangeIndex(3),
         pd.CategoricalIndex('A B C'.split()),
+        pd.CategoricalIndex('A B C'.split(), ordered=True),
         pd.MultiIndex.from_arrays(['A B C'.split(), 'D E F'.split()]),
         pd.IntervalIndex.from_breaks([0, 1, 2, 3]),
         pd.DatetimeIndex([dt.datetime(2013, 1, 3, 0, 0),
                           dt.datetime(2013, 1, 3, 6, 10),
                           dt.datetime(2013, 1, 3, 7, 12)]),
         pd.Index([1, 2, 3]),
-    ])
+    ], ids=lambda x: str(x.dtype))
     def test_append_same_columns_type(self, df_columns):
         # GH18359
 
@@ -873,7 +874,7 @@ def test_append_same_columns_type(self, df_columns):
         pd.DatetimeIndex([dt.datetime(2013, 1, 3, 0, 0),
                           dt.datetime(2013, 1, 3, 6, 10),
                           dt.datetime(2013, 1, 3, 7, 12)]),
-    ], r=2))
+    ], r=2), ids=lambda x: str(x.dtype))
     def test_append_different_columns_types(self, df_columns, series_index):
         # GH18359
         # see also tests 'test_append_multi_index_raises' and
@@ -895,12 +896,13 @@ def test_append_different_columns_types(self, df_columns, series_index):
     @pytest.mark.parametrize("other_type", [
         pd.RangeIndex(3),
         pd.CategoricalIndex('A B C'.split()),
+        pd.CategoricalIndex('A B C'.split(), ordered=True),
         pd.IntervalIndex.from_breaks([0, 1, 2, 3]),
         pd.DatetimeIndex([dt.datetime(2013, 1, 3, 0, 0),
                           dt.datetime(2013, 1, 3, 6, 10),
                           dt.datetime(2013, 1, 3, 7, 12)]),
         pd.Index([4, 5, 6]),
-    ])
+    ], ids=lambda x: str(x.dtype))
     def test_append_multi_index_raises(self, other_type):
         # GH18359
         # .append will raise if MultiIndex appends or is appended to a
@@ -923,12 +925,13 @@ def test_append_multi_index_raises(self, other_type):
     @pytest.mark.parametrize("other_type", [
         pd.RangeIndex(3),
         pd.CategoricalIndex('A B C'.split()),
+        pd.CategoricalIndex('A B C'.split(), ordered=True),
         pd.MultiIndex.from_arrays(['A B C'.split(), 'D E F'.split()]),
         pd.DatetimeIndex([dt.datetime(2013, 1, 3, 0, 0),
                           dt.datetime(2013, 1, 3, 6, 10),
                           dt.datetime(2013, 1, 3, 7, 12)]),
         pd.Index([4, 5, 6]),
-    ])
+    ], ids=lambda x: str(x.dtype))
     def test_append_interval_index_raises(self, other_type):
         # GH18359
         # .append will raise if IntervalIndex appends or is appended to a