Merge remote-tracking branch 'upstream/main' into frame-rank-extension-array

Author: sharkipelago

pandas/tests/copy_view/test_methods.py

@@ -16,6 +16,7 @@
 )
 import pandas._testing as tm
 from pandas.tests.copy_view.util import get_array
+from pandas.util.version import Version
 
 
 def test_copy():
@@ -917,8 +918,9 @@ def test_round(decimals):
 
  assert tm.shares_memory(get_array(df2, "b"), get_array(df, "b"))
  # TODO: Make inplace by using out parameter of ndarray.round?
- if decimals >= 0:
+ if decimals >= 0 and Version(np.__version__) < Version("2.4.0.dev0"):
  # Ensure lazy copy if no-op
+ # TODO: Cannot rely on Numpy returning view after version 2.3
  assert np.shares_memory(get_array(df2, "a"), get_array(df, "a"))
  else:
  assert not np.shares_memory(get_array(df2, "a"), get_array(df, "a"))

pandas/tests/extension/test_arrow.py

@@ -3333,9 +3333,9 @@ def test_factorize_chunked_dictionary():
  )
  ser = pd.Series(ArrowExtensionArray(pa_array))
  res_indices, res_uniques = ser.factorize()
- exp_indicies = np.array([0, 1], dtype=np.intp)
+ exp_indices = np.array([0, 1], dtype=np.intp)
  exp_uniques = pd.Index(ArrowExtensionArray(pa_array.combine_chunks()))
- tm.assert_numpy_array_equal(res_indices, exp_indicies)
+ tm.assert_numpy_array_equal(res_indices, exp_indices)
  tm.assert_index_equal(res_uniques, exp_uniques)