Merge branch 'master' of https://github.com/pandas-dev/pandas into use-doc-decorator

Author: HH-MWB

ci/code_checks.sh

@@ -259,8 +259,7 @@ fi
 if [[ -z "$CHECK" || "$CHECK" == "doctests" ]]; then
 
     MSG='Doctests frame.py' ; echo $MSG
-    pytest -q --doctest-modules pandas/core/frame.py \
-        -k" -itertuples -join -reindex -reindex_axis -round"
+    pytest -q --doctest-modules pandas/core/frame.py
     RET=$(($RET + $?)) ; echo $MSG "DONE"
 
     MSG='Doctests series.py' ; echo $MSG
@@ -294,8 +293,7 @@ if [[ -z "$CHECK" || "$CHECK" == "doctests" ]]; then
     MSG='Doctests interval classes' ; echo $MSG
     pytest -q --doctest-modules \
         pandas/core/indexes/interval.py \
-        pandas/core/arrays/interval.py \
-        -k"-from_arrays -from_breaks -from_intervals -from_tuples -set_closed -to_tuples -interval_range"
+        pandas/core/arrays/interval.py
     RET=$(($RET + $?)) ; echo $MSG "DONE"
 
     MSG='Doctests arrays'; echo $MSG

pandas/conftest.py

@@ -17,6 +17,7 @@
 from pandas import DataFrame
 import pandas._testing as tm
 from pandas.core import ops
+from pandas.core.indexes.api import Index, MultiIndex
 
 hypothesis.settings.register_profile(
     "ci",
@@ -953,3 +954,69 @@ def __len__(self):
             return self._data.__len__()
 
     return TestNonDictMapping
+
+
+indices_dict = {
+    "unicode": tm.makeUnicodeIndex(100),
+    "string": tm.makeStringIndex(100),
+    "datetime": tm.makeDateIndex(100),
+    "datetime-tz": tm.makeDateIndex(100, tz="US/Pacific"),
+    "period": tm.makePeriodIndex(100),
+    "timedelta": tm.makeTimedeltaIndex(100),
+    "int": tm.makeIntIndex(100),
+    "uint": tm.makeUIntIndex(100),
+    "range": tm.makeRangeIndex(100),
+    "float": tm.makeFloatIndex(100),
+    "bool": tm.makeBoolIndex(2),
+    "categorical": tm.makeCategoricalIndex(100),
+    "interval": tm.makeIntervalIndex(100),
+    "empty": Index([]),
+    "tuples": MultiIndex.from_tuples(zip(["foo", "bar", "baz"], [1, 2, 3])),
+    "repeats": Index([0, 0, 1, 1, 2, 2]),
+}
+
+
+@pytest.fixture(params=indices_dict.keys())
+def indices(request):
+    # copy to avoid mutation, e.g. setting .name
+    return indices_dict[request.param].copy()
+
+
+def _create_series(index):
+    """ Helper for the _series dict """
+    size = len(index)
+    data = np.random.randn(size)
+    return pd.Series(data, index=index, name="a")
+
+
+_series = {
+    f"series-with-{index_id}-index": _create_series(index)
+    for index_id, index in indices_dict.items()
+}
+
+
+_narrow_dtypes = [
+    np.float16,
+    np.float32,
+    np.int8,
+    np.int16,
+    np.int32,
+    np.uint8,
+    np.uint16,
+    np.uint32,
+]
+_narrow_series = {
+    f"{dtype.__name__}-series": tm.makeFloatSeries(name="a").astype(dtype)
+    for dtype in _narrow_dtypes
+}
+
+_index_or_series_objs = {**indices_dict, **_series, **_narrow_series}
+
+
+@pytest.fixture(params=_index_or_series_objs.keys())
+def index_or_series_obj(request):
+    """
+    Fixture for tests on indexes, series and series with a narrow dtype
+    copy to avoid mutation, e.g. setting .name
+    """
+    return _index_or_series_objs[request.param].copy(deep=True)

pandas/tests/arrays/test_integer.py

@@ -347,10 +347,10 @@ def test_error(self, data, all_arithmetic_operators):
             # TODO(extension)
             # rpow with a datetimelike coerces the integer array incorrectly
             msg = (
-                r"(:?can only perform ops with numeric values)"
-                r"|(:?cannot perform .* with this index type: DatetimeArray)"
-                r"|(:?Addition/subtraction of integers and integer-arrays"
-                r" with DatetimeArray is no longer supported. *)"
+                "can only perform ops with numeric values|"
+                "cannot perform .* with this index type: DatetimeArray|"
+                "Addition/subtraction of integers and integer-arrays "
+                "with DatetimeArray is no longer supported. *"
             )
             with pytest.raises(TypeError, match=msg):
                 ops(pd.Series(pd.date_range("20180101", periods=len(s))))

pandas/tests/base/test_ops.py

@@ -109,26 +109,26 @@ def test_binary_ops(klass, op_name, op):
     assert expected_str in getattr(klass, "r" + op_name).__doc__
 
 
-class TestTranspose(Ops):
+class TestTranspose:
     errmsg = "the 'axes' parameter is not supported"
 
-    def test_transpose(self):
-        for obj in self.objs:
-            tm.assert_equal(obj.transpose(), obj)
+    def test_transpose(self, index_or_series_obj):
+        obj = index_or_series_obj
+        tm.assert_equal(obj.transpose(), obj)
 
-    def test_transpose_non_default_axes(self):
-        for obj in self.objs:
-            with pytest.raises(ValueError, match=self.errmsg):
-                obj.transpose(1)
-            with pytest.raises(ValueError, match=self.errmsg):
-                obj.transpose(axes=1)
+    def test_transpose_non_default_axes(self, index_or_series_obj):
+        obj = index_or_series_obj
+        with pytest.raises(ValueError, match=self.errmsg):
+            obj.transpose(1)
+        with pytest.raises(ValueError, match=self.errmsg):
+            obj.transpose(axes=1)
 
-    def test_numpy_transpose(self):
-        for obj in self.objs:
-            tm.assert_equal(np.transpose(obj), obj)
+    def test_numpy_transpose(self, index_or_series_obj):
+        obj = index_or_series_obj
+        tm.assert_equal(np.transpose(obj), obj)
 
-            with pytest.raises(ValueError, match=self.errmsg):
-                np.transpose(obj, axes=1)
+        with pytest.raises(ValueError, match=self.errmsg):
+            np.transpose(obj, axes=1)
 
 
 class TestIndexOps(Ops):

pandas/tests/indexes/conftest.py

@@ -34,6 +34,7 @@
     period_range,
 )
 import pandas._testing as tm
+from pandas.conftest import indices_dict
 from pandas.core.indexes.api import (
     Index,
     MultiIndex,
@@ -42,7 +43,6 @@
     ensure_index_from_sequences,
 )
 from pandas.tests.indexes.common import Base
-from pandas.tests.indexes.conftest import indices_dict
 
 
 class TestIndex(Base):

pandas/tests/indexes/test_base.py

@@ -13,7 +13,7 @@
 from pandas import Float64Index, Int64Index, RangeIndex, UInt64Index
 import pandas._testing as tm
 from pandas.api.types import pandas_dtype
-from pandas.tests.indexes.conftest import indices_dict
+from pandas.conftest import indices_dict
 
 COMPATIBLE_INCONSISTENT_PAIRS = {
     (Int64Index, RangeIndex): (tm.makeIntIndex, tm.makeRangeIndex),