Skip to content

Commit

Permalink
Merge branch 'main' into delede-pd-version-lt-1.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Aug 19, 2024
2 parents b9d7d12 + 2991976 commit 3f438f4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions CI/test_basic_execution.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@


def test_basic_cases():
with warnings.catch_warnings():
# TODO: change warnings.simplefilter("error") to "module"
with warnings.catch_warnings():
# "error" help us find the deprecated APIs
warnings.simplefilter("module")
warnings.simplefilter("error")
import xorbits
import xorbits.pandas as pd
import xorbits.numpy as np
Expand Down
2 changes: 1 addition & 1 deletion python/xorbits/_mars/_utils.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ cdef list tokenize_pandas_series(ob):


cdef list tokenize_pandas_dataframe(ob):
l = [block.values for block in ob._data.blocks]
l = [block.values for block in ob._mgr.blocks]
l.extend([ob.columns, ob.index])
return iterative_tokenize(l)

Expand Down

0 comments on commit 3f438f4

Please sign in to comment.