Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FEAT-#5936: support pandas 2.0.2 #5995

Merged
merged 190 commits into from
Jun 7, 2023

Conversation

anmyachev
Copy link
Collaborator

@anmyachev anmyachev commented Apr 12, 2023

What do these changes do?

  • first commit message and PR title follow format outlined here

    NOTE: If you edit the PR title to match this format, you need to add another commit (even if it's empty) or amend your last commit for the CI job that checks the PR title to pick up the new PR title.

  • passes flake8 modin/ asv_bench/benchmarks scripts/doc_checker.py
  • passes black --check modin/ asv_bench/benchmarks scripts/doc_checker.py
  • signed commit with git commit -s
  • Resolves Support pandas 2.x #5936
  • tests added and passing
  • module layout described at docs/development/architecture.rst is up-to-date

Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
@anmyachev
Copy link
Collaborator Author

@vnlitvinov ready for review

Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
@vnlitvinov
Copy link
Collaborator

@anmyachev there are a few open questions left from previous review, but most of them are minor.
I think the only major blocker for me is my last comment, about updating QC in-place.

Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
dchigarev
dchigarev previously approved these changes Jun 6, 2023
Copy link
Collaborator

@dchigarev dchigarev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good from my side

thank you for this massive work!

modin/pandas/series.py Show resolved Hide resolved
anmyachev and others added 2 commits June 6, 2023 16:43
Co-authored-by: Dmitry Chigarev <dmitry.chigarev@intel.com>
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
@anmyachev
Copy link
Collaborator Author

@dchigarev ready for review

dchigarev
dchigarev previously approved these changes Jun 6, 2023
YarShev
YarShev previously approved these changes Jun 6, 2023
@YarShev
Copy link
Collaborator

YarShev commented Jun 6, 2023

@vnlitvinov, any comments?

@anmyachev anmyachev changed the title FEAT-#5936: support pandas 2.0.0 FEAT-#5936: support pandas 2.0.2 Jun 6, 2023
@anmyachev anmyachev dismissed stale reviews from YarShev and dchigarev via 3e7e55a June 7, 2023 11:53
@mvashishtha
Copy link
Collaborator

@anmyachev
Copy link
Collaborator Author

@vnlitvinov, any comments?

@YarShev @dchigarev I see that @vnlitvinov comment about _update_inplace is still open

https://github.com/modin-project/modin/pull/5995/files/7edd9bdd8bcaa16466f666949d5314d460f610ea..6d7e8d260bf08a7bb304c258e902c237736aa043#r1219040039

@mvashishtha I fixed it but forgot to reply to the comment

@mvashishtha mvashishtha merged commit 1d8a179 into modin-project:master Jun 7, 2023
49 of 50 checks passed
@anmyachev anmyachev deleted the pandas-2.0.0 branch June 7, 2023 19:23
ReadSqlEngine.put(read_sql_engine)
if ReadSqlEngine.get() == "Connectorx":
modin_df = pd.read_sql(sql=query, con=conn)
else:
modin_df = pd.read_sql(
sql=query, con=ModinDatabaseConnection("sqlalchemy", conn)
)
ReadSqlEngine.put(old_sql_engine)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be done in try..finally to be absolutely sure we return the value back... not critical in tests I suppose, so mostly a note for the future patterns

Comment on lines +2258 to +2260
def comparator(df1, df2):
df_equals(df1, df2)
df_equals(df1.dtypes, df2.dtypes)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

feels like it should be extracted to a common place, this comparator is written in a few places already; could go in some tests refactoring PR I suppose

@vnlitvinov
Copy link
Collaborator

@anmyachev thanks for the tremendous amount of effort into making this PR by the way!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support pandas 2.x
6 participants