misc. small fixes

Author: patrickmckenna

pandas/tests/libs/test_ops.py

@@ -1,4 +1,5 @@
 import operator
+from platform import architecture
 
 import numpy as np
 import pytest
@@ -17,12 +18,12 @@ def fixture_int_min() -> int:
 
 
 @pytest.fixture(name="float_max", scope="module")
-def fixture_float_max() -> int:
+def fixture_float_max() -> np.float64:
     return np.finfo(np.float64).max
 
 
 @pytest.fixture(name="float_min", scope="module")
-def fixture_float_min() -> int:
+def fixture_float_min() -> np.float64:
     return np.finfo(np.float64).min
 
 
@@ -130,7 +131,15 @@ def test_raises_for_too_large_result(
                     strict=True,
                 ),
             ),
-            1024.1,
+            pytest.param(
+                1024.1,
+                marks=pytest.mark.xfail(
+                    condition=architecture()[0] == "32bit",
+                    reason="overflows earlier",
+                    raises=pytest.fail.Exception,
+                    strict=True,
+                ),
+            ),
         ),
     )
     def test_raises_for_most_too_small_results(

pandas/tests/scalar/timedelta/test_arithmetic.py

@@ -14,7 +14,10 @@
 import numpy as np
 import pytest
 
-from pandas._libs.tslibs import OutOfBoundsTimedelta
+from pandas._libs.tslibs import (
+    NaTType,
+    OutOfBoundsTimedelta,
+)
 
 import pandas as pd
 from pandas import (
@@ -33,6 +36,7 @@ def fixture_tdlike_cls(request) -> type:
     return request.param
 
 
+# Tick, too?
 @pytest.fixture(
     name="tdlike_or_offset_cls",
     params=(Timedelta, timedelta, np.timedelta64, offsets.Nano),
@@ -437,9 +441,9 @@ def test_numeric(self, ten_days, mul_op, factor, expected, box_with_array):
     @pytest.mark.parametrize("factor", (1.01, 2), ids=("int", "float"))
     def test_returns_nat_if_result_overflows(self, mul_op, factor, box_with_array):
         numeric_box = tm.box_expected((1, factor), box_with_array, transpose=False)
-        result = mul_op(pd.Timedelta.max, numeric_box)
+        result = mul_op(Timedelta.max, numeric_box)
         expected = tm.box_expected(
-            (pd.Timedelta.max, NaT),
+            (Timedelta.max, NaT),
             box_with_array,
             transpose=False,
         )
@@ -574,22 +578,25 @@ def test_offset(self, ten_days: Timedelta, div_op, expected):
         assert result == expected
 
     def test_na(self, request, ten_days: Timedelta, truediv_op, na_value):
-        expected = NaT
-        if na_value is NA or (
+        expected: NaTType | float = NaT
+
+        if na_value is None or na_value is NaT:
+            expected = np.nan
+        elif na_value is NA or (
             truediv_op is ops.rtruediv and isinstance(na_value, float)
         ):
             request.applymarker(xfail_type_error)
-        elif na_value is None or na_value is NaT:
-            expected = np.nan
+
         result = truediv_op(ten_days, na_value)
         assert result is expected
 
     def test_floordiv_na(self, request, ten_days: Timedelta, na_value):
-        expected = NaT
-        if na_value is NA:
-            request.applymarker(xfail_type_error)
-        elif na_value is None or na_value is NaT:
+        expected: NaTType | float = NaT
+
+        if na_value is None or na_value is NaT:
             expected = np.nan
+        elif na_value is NA:
+            request.applymarker(xfail_type_error)
 
         result = ten_days // na_value
         assert result is expected
@@ -618,7 +625,8 @@ def test_rmod_na(self, request, ten_days: Timedelta, na_value):
         assert result is NaT
 
     def test_divmod_na(self, request, ten_days: Timedelta, na_value):
-        expected = (NaT, NaT)
+        expected: tuple[NaTType | float, NaTType] = (NaT, NaT)
+
         if na_value is None or na_value is NA:
             request.applymarker(xfail_type_error)
         elif na_value is NaT: