fix various issues

Author: Terji Petersen

pandas/core/indexes/base.py

@@ -79,7 +79,7 @@
     can_hold_element,
     common_dtype_categorical_compat,
     ensure_dtype_can_hold_na,
-    find_common_type,
+    find_result_type,
     infer_dtype_from,
     maybe_cast_pointwise_result,
     np_can_hold_element,
@@ -124,6 +124,7 @@
     ABCDatetimeIndex,
     ABCMultiIndex,
     ABCPeriodIndex,
+    ABCRangeIndex,
     ABCSeries,
     ABCTimedeltaIndex,
 )
@@ -5858,7 +5859,7 @@ def _find_common_type_compat(self, target) -> DtypeObj:
             ):
                 return _dtype_obj
 
-        dtype = find_common_type([self.dtype, target_dtype])
+        dtype = find_result_type(self._values, target)
         dtype = common_dtype_categorical_compat([self, target], dtype)
         return dtype
 

pandas/tests/indexes/interval/test_constructors.py

@@ -18,7 +18,6 @@
     timedelta_range,
 )
 import pandas._testing as tm
-from pandas.api.types import is_unsigned_integer_dtype
 from pandas.core.api import NumericIndex
 from pandas.core.arrays import IntervalArray
 import pandas.core.common as com
@@ -321,12 +320,6 @@ def breaks_and_expected_subtype(self, request):
 class TestFromTuples(TuplesClassConstructorTests):
     """Tests specific to IntervalIndex.from_tuples"""
 
-    def _skip_test_constructor(self, dtype):
-        if is_unsigned_integer_dtype(dtype):
-            return True, "tuples don't have a dtype"
-        else:
-            return False, ""
-
     @pytest.fixture
     def constructor(self):
         return IntervalIndex.from_tuples
@@ -374,14 +367,6 @@ def test_na_tuples(self):
 class TestClassConstructors(TuplesClassConstructorTests):
     """Tests specific to the IntervalIndex/Index constructors"""
 
-    def _skip_test_constructor(self, dtype):
-        # get_kwargs_from_breaks in TestFromTuples and TestClassconstructors just return
-        # tuples of ints, so IntervalIndex can't know the original dtype
-        if is_unsigned_integer_dtype(dtype):
-            return True, "tuples don't have a dtype"
-        else:
-            return False, ""
-
     @pytest.fixture(
         params=[IntervalIndex, partial(Index, dtype="interval")],
         ids=["IntervalIndex", "Index"],

pandas/tests/series/indexing/test_setitem.py

@@ -793,7 +793,8 @@ def test_index_where(self, obj, key, expected, val):
         mask[key] = True
 
         res = Index(obj).where(~mask, val)
-        tm.assert_index_equal(res, Index(expected, dtype=expected.dtype))
+        expected_idx = Index(expected, dtype=expected.dtype)
+        tm.assert_index_equal(res, expected_idx)
 
     def test_index_putmask(self, obj, key, expected, val):
         mask = np.zeros(obj.shape, dtype=bool)
@@ -1153,7 +1154,7 @@ def expected(self, val):
         return Series(res_values)
 
 
-@pytest.mark.parametrize("val", [np.int16(512), np.int16(512)])
+@pytest.mark.parametrize("val", [512, np.int16(512)])
 class TestSetitemIntoIntegerSeriesNeedsUpcast(SetitemCastingEquivalents):
     @pytest.fixture
     def obj(self):
@@ -1168,7 +1169,7 @@ def expected(self):
         return Series([1, 512, 3], dtype=np.int16)
 
 
-@pytest.mark.parametrize("val", [2**30 + 1.0, 2**33 + 1.1, 2**62])
+@pytest.mark.parametrize("val", [2**33 + 1.0, 2**33 + 1.1, 2**62])
 class TestSmallIntegerSetitemUpcast(SetitemCastingEquivalents):
     # https://github.com/pandas-dev/pandas/issues/39584#issuecomment-941212124
     @pytest.fixture
@@ -1181,12 +1182,10 @@ def key(self):
 
     @pytest.fixture
     def expected(self, val):
-        if val > np.iinfo(np.int64).max:
+        if val % 1 != 0:
             dtype = "f8"
-        elif val > np.iinfo(np.int32).max:
-            dtype = "i8"
         else:
-            dtype = "i4"
+            dtype = "i8"
         return Series([val, 2, 3], dtype=dtype)