Merge branch 'master' into na-cat

Author: Daniel Saxton

pandas/_libs/src/inline_helper.h

@@ -11,7 +11,9 @@ The full license is in the LICENSE file, distributed with this software.
 #define PANDAS__LIBS_SRC_INLINE_HELPER_H_
 
 #ifndef PANDAS_INLINE
-  #if defined(__GNUC__)
+  #if defined(__clang__)
+    #define PANDAS_INLINE static __inline__ __attribute__ ((__unused__))
+  #elif defined(__GNUC__)
     #define PANDAS_INLINE static __inline__
   #elif defined(_MSC_VER)
     #define PANDAS_INLINE static __inline

pandas/tests/frame/test_cumulative.py

@@ -75,7 +75,9 @@ def test_cumprod(self, datetime_frame):
         df.cumprod(1)
 
     @pytest.mark.xfail(
-        _is_numpy_dev, reason="https://github.com/pandas-dev/pandas/issues/31992"
+        _is_numpy_dev,
+        reason="https://github.com/pandas-dev/pandas/issues/31992",
+        strict=False,
     )
     def test_cummin(self, datetime_frame):
         datetime_frame.loc[5:10, 0] = np.nan
@@ -101,7 +103,9 @@ def test_cummin(self, datetime_frame):
         assert np.shape(cummin_xs) == np.shape(datetime_frame)
 
     @pytest.mark.xfail(
-        _is_numpy_dev, reason="https://github.com/pandas-dev/pandas/issues/31992"
+        _is_numpy_dev,
+        reason="https://github.com/pandas-dev/pandas/issues/31992",
+        strict=False,
     )
     def test_cummax(self, datetime_frame):
         datetime_frame.loc[5:10, 0] = np.nan

pandas/tests/groupby/test_function.py

@@ -687,7 +687,9 @@ def test_numpy_compat(func):
 
 
 @pytest.mark.xfail(
-    _is_numpy_dev, reason="https://github.com/pandas-dev/pandas/issues/31992"
+    _is_numpy_dev,
+    reason="https://github.com/pandas-dev/pandas/issues/31992",
+    strict=False,
 )
 def test_cummin_cummax():
     # GH 15048

pandas/tests/scalar/timedelta/test_arithmetic.py

@@ -386,6 +386,7 @@ def test_td_div_numeric_scalar(self):
                 marks=pytest.mark.xfail(
                     _is_numpy_dev,
                     reason="https://github.com/pandas-dev/pandas/issues/31992",
+                    strict=False,
                 ),
             ),
             float("nan"),

pandas/tests/series/test_cumulative.py

@@ -39,7 +39,9 @@ def test_cumprod(self, datetime_series):
         _check_accum_op("cumprod", datetime_series)
 
     @pytest.mark.xfail(
-        _is_numpy_dev, reason="https://github.com/pandas-dev/pandas/issues/31992"
+        _is_numpy_dev,
+        reason="https://github.com/pandas-dev/pandas/issues/31992",
+        strict=False,
     )
     def test_cummin(self, datetime_series):
         tm.assert_numpy_array_equal(
@@ -54,7 +56,9 @@ def test_cummin(self, datetime_series):
         tm.assert_series_equal(result, expected)
 
     @pytest.mark.xfail(
-        _is_numpy_dev, reason="https://github.com/pandas-dev/pandas/issues/31992"
+        _is_numpy_dev,
+        reason="https://github.com/pandas-dev/pandas/issues/31992",
+        strict=False,
     )
     def test_cummax(self, datetime_series):
         tm.assert_numpy_array_equal(

pandas/tests/test_downstream.py

@@ -19,7 +19,7 @@ def import_module(name):
     try:
         return importlib.import_module(name)
     except ModuleNotFoundError:  # noqa
-        pytest.skip("skipping as {} not available".format(name))
+        pytest.skip(f"skipping as {name} not available")
 
 
 @pytest.fixture

pandas/tests/test_multilevel.py

@@ -896,10 +896,10 @@ def test_stack_unstack_unordered_multiindex(self):
         values = np.arange(5)
         data = np.vstack(
             [
-                ["b{}".format(x) for x in values],  # b0, b1, ..
-                ["a{}".format(x) for x in values],
+                [f"b{x}" for x in values],  # b0, b1, ..
+                [f"a{x}" for x in values],  # a0, a1, ..
             ]
-        )  # a0, a1, ..
+        )
         df = pd.DataFrame(data.T, columns=["b", "a"])
         df.columns.name = "first"
         second_level_dict = {"x": df}

pandas/tests/tools/test_numeric.py

@@ -308,7 +308,7 @@ def test_really_large_in_arr_consistent(large_val, signed, multiple_elts, errors
 
     if errors in (None, "raise"):
         index = int(multiple_elts)
-        msg = "Integer out of range. at position {index}".format(index=index)
+        msg = f"Integer out of range. at position {index}"
 
         with pytest.raises(ValueError, match=msg):
             to_numeric(arr, **kwargs)

pandas/tests/tslibs/test_parse_iso8601.py

@@ -51,7 +51,7 @@ def test_parsers_iso8601(date_str, exp):
     ],
 )
 def test_parsers_iso8601_invalid(date_str):
-    msg = 'Error parsing datetime string "{s}"'.format(s=date_str)
+    msg = f'Error parsing datetime string "{date_str}"'
 
     with pytest.raises(ValueError, match=msg):
         tslib._test_parse_iso8601(date_str)

pandas/tests/window/moments/test_moments_rolling.py

@@ -860,7 +860,7 @@ def get_result(obj, window, min_periods=None, center=False):
             tm.assert_series_equal(result, expected)
 
             # shifter index
-            s = ["x{x:d}".format(x=x) for x in range(12)]
+            s = [f"x{x:d}" for x in range(12)]
 
             if has_min_periods:
                 minp = 10
@@ -1437,13 +1437,9 @@ def test_rolling_median_memory_error(self):
     def test_rolling_min_max_numeric_types(self):
 
         # GH12373
-        types_test = [np.dtype("f{}".format(width)) for width in [4, 8]]
+        types_test = [np.dtype(f"f{width}") for width in [4, 8]]
         types_test.extend(
-            [
-                np.dtype("{}{}".format(sign, width))
-                for width in [1, 2, 4, 8]
-                for sign in "ui"
-            ]
+            [np.dtype(f"{sign}{width}") for width in [1, 2, 4, 8] for sign in "ui"]
         )
         for data_type in types_test:
             # Just testing that these don't throw exceptions and that