fix pandas 2.1.1

xorbitsai · Sep 21, 2023 · b990ca5 · b990ca5
1 parent 863f7a7
commit b990ca5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/python/xorbits/_mars/dataframe/base/tests/test_base_execution.py b/python/xorbits/_mars/dataframe/base/tests/test_base_execution.py
@@ -1729,12 +1729,10 @@ def test_value_counts_execution(setup):
  r = series.value_counts()
  pd.testing.assert_series_equal(r.execute().fetch(), s.value_counts())
 
- # pandas issue: https://github.com/pandas-dev/pandas/issues/54857
- if pd.__version__ != "2.1.0":
- r = series.value_counts(bins=5, normalize=True)
- pd.testing.assert_series_equal(
- r.execute().fetch(), s.value_counts(bins=5, normalize=True)
- )
+ r = series.value_counts(bins=5, normalize=True)
+ pd.testing.assert_series_equal(
+ r.execute().fetch(), s.value_counts(bins=5, normalize=True)
+ )
 
  # test multi chunks
  series = from_pandas_series(s, chunk_size=30)
@@ -1746,11 +1744,10 @@ def test_value_counts_execution(setup):
  pd.testing.assert_series_equal(r.execute().fetch(), s.value_counts(normalize=True))
 
  # test bins and normalize
- if pd.__version__ != "2.1.0":
- r = series.value_counts(method="tree", bins=5, normalize=True)
- pd.testing.assert_series_equal(
- r.execute().fetch(), s.value_counts(bins=5, normalize=True)
- )
+ r = series.value_counts(method="tree", bins=5, normalize=True)
+ pd.testing.assert_series_equal(
+ r.execute().fetch(), s.value_counts(bins=5, normalize=True)
+ )
 
 
 def test_astype(setup):

diff --git a/python/xorbits/_mars/dataframe/base/value_counts.py b/python/xorbits/_mars/dataframe/base/value_counts.py
@@ -193,6 +193,9 @@ def execute(cls, ctx, op: "DataFrameValueCounts"):
  # convert CategoricalDtype which generated in `cut`
  # to IntervalDtype
  result.index = result.index.astype("interval")
+ # index name changed since pandas 2.1.1
+ if pd_release_version >= (2, 1, 1):
+ result.index.name = None
  if op.nrows:
  result = result.head(op.nrows)
  result.name = op.outputs[0].name