changes for pre-commit.ci

Author: xaris96

pandas/tests/indexes/test_common.py

@@ -445,9 +445,8 @@ def test_hasnans_isnans(self, index_flat):
 def test_sort_values_invalid_na_position(index_with_missing, na_position):
     non_na_values = [x for x in index_with_missing if pd.notna(x)]
     if len({type(x) for x in non_na_values}) > 1:
-        pytest.mark.xfail(
-            reason="Sorting fails due to heterogeneous types in index (int vs str)"
-        )
+        pytest.xfail("Sorting fails due to heterogeneous types in index"
+                    " (int vs str)")
 
     with pytest.raises(ValueError, match=f"invalid na_position: {na_position}"):
         index_with_missing.sort_values(na_position=na_position)
@@ -464,9 +463,8 @@ def test_sort_values_with_missing(index_with_missing, na_position, request):
 
     non_na_values = [x for x in index_with_missing if pd.notna(x)]
     if len({type(x) for x in non_na_values}) > 1:
-        pytest.mark.xfail(
-            reason="Sorting fails due to heterogeneous types in index (int vs str)"
-        )
+        pytest.xfail("Sorting fails due to heterogeneous types"
+                    " in index (int vs str)")
 
     if isinstance(index_with_missing, CategoricalIndex):
         request.applymarker(

pandas/tests/indexes/test_numpy_compat.py

@@ -155,17 +155,12 @@ def test_numpy_ufuncs_reductions(index, func, request):
     # TODO: overlap with tests.series.test_ufunc.test_reductions
     if len(index) == 0:
         pytest.skip("Test doesn't make sense for empty index.")
-
-    if any(isinstance(x, str) for x in index) and any(
-        isinstance(x, int) for x in index
-    ):
+    has_str = any(isinstance(x, str) for x in index)
+    has_int = any(isinstance(x, int) for x in index)
+    if has_str and has_int:
         request.applymarker(
-            pytest.mark.xfail(
-                reason=(
-                    "Cannot compare mixed types (int and str) in ufunc reductions"
-                    " and should raise a TypeError"
-                )
-            )
+            pytest.mark.xfail(reason="Cannot compare mixed types (int and str)"
+                            " in ufunc reductions")
         )
     if isinstance(index, CategoricalIndex) and index.dtype.ordered is False:
         with pytest.raises(TypeError, match="is not ordered for"):

pandas/tests/indexes/test_setops.py

@@ -76,11 +76,9 @@ def test_union_same_types(index):
 def test_union_different_types(index_flat, index_flat2, request):
     idx1 = index_flat
     idx2 = index_flat2
-
-    # Special handling for mixed int-string types
-    if idx1.equals(pd.Index([0, "a", 1, "b", 2, "c"])) or idx2.equals(
-        pd.Index([0, "a", 1, "b", 2, "c"])
-    ):
+    # mixed int string
+    target_index = pd.Index([0, "a", 1, "b", 2, "c"])
+    if idx1.equals(target_index) or idx2.equals(target_index):
         idx1 = idx1.astype(str)
         idx2 = idx2.astype(str)
 
@@ -922,17 +920,16 @@ def test_symmetric_difference_mi(self, sort):
         index2 = MultiIndex.from_tuples([("foo", 1), ("bar", 3)])
 
         def has_mixed_types(level):
-            return any(isinstance(x, str) for x in level) and any(
-                isinstance(x, int) for x in level
+            return (
+                any(isinstance(x, str) for x in level)
+                and any(isinstance(x, int) for x in level)
             )
 
         for idx in [index1, index2]:
             for lvl in range(idx.nlevels):
                 if has_mixed_types(idx.get_level_values(lvl)):
-                    skip_message = (
-                        f"Mixed types in MultiIndex level {lvl} are not orderable"
-                    )
-                    pytest.skip(skip_message)
+                    pytest.skip(f"Mixed types in MultiIndex level {lvl}"
+                                " are not orderable")
 
         result = index1.symmetric_difference(index2, sort=sort)
         expected = MultiIndex.from_tuples([("bar", 2), ("baz", 3), ("bar", 3)])

pandas/tests/test_algos.py

@@ -63,9 +63,12 @@ def test_factorize_complex(self):
         expected_uniques = np.array([(1 + 0j), (2 + 0j), (2 + 1j)], dtype=complex)
         tm.assert_numpy_array_equal(uniques, expected_uniques)
 
-    @pytest.mark.parametrize(
-        "index_or_series_obj", [[1, 2, 3], ["a", "b", "c"], [0, "a", 1, "b", 2, "c"]]
-    )
+    @pytest.mark.parametrize("index_or_series_obj",
+                            [
+                            [1, 2, 3],
+                            ["a", "b", "c"],
+                            [0, "a", 1, "b", 2, "c"]
+                            ])
     @pytest.mark.parametrize("sort", [True, False])
     def test_factorize(self, index_or_series_obj, sort):
         obj = Index(index_or_series_obj)
@@ -74,11 +77,9 @@ def test_factorize(self, index_or_series_obj, sort):
             pytest.skip("Skipping test for empty Index")
 
         if obj.name == "mixed-int-string" or obj.name is None:
-            skip_message = (
-                "Skipping test for mixed-int-string due to unsupported comparison "
-                "between str and int"
-            )
-            pytest.skip(skip_message)
+            pytest.skip("Skipping test for mixed-int-string due"
+                        " to unsupported comparison between str and int")
+
 
         result_codes, result_uniques = obj.factorize(sort=sort)