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

Revert fastparquet nullable dtype support #42954

Merged
merged 10 commits into from
Aug 10, 2021

Conversation

lithomas1
Copy link
Member

  • closes #xxxx
  • tests added / passed
  • Ensure all linting tests pass, see here for how to run them
  • whatsnew entry

@pep8speaks
Copy link

pep8speaks commented Aug 9, 2021

Hello @lithomas1! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2021-08-10 18:43:10 UTC

@lithomas1 lithomas1 marked this pull request as ready for review August 9, 2021 18:26
@lithomas1 lithomas1 added the IO Parquet parquet, feather label Aug 9, 2021
@lithomas1 lithomas1 added this to the 1.3.2 milestone Aug 9, 2021
@lithomas1
Copy link
Member Author

OK, failing tests are flaky. So this is ready for review now. The backport will be a bit tricky, so I'll do it manually. (Basically backport the last PR and this PR together. We're still gonna backport that one since it unpins fastparquet even though most of its changes are reverted here).

cc @jorisvandenbossche (sorry for not pinging last time) @jreback

Copy link
Member

@jorisvandenbossche jorisvandenbossche left a comment

Choose a reason for hiding this comment

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

Thanks a lot, looks good to me

The backport will be a bit tricky, so I'll do it manually. (Basically backport the last PR and this PR together. We're still gonna backport that one since it unpins fastparquet even though most of its changes are reverted here).

Another option is to first do a simple plain revert of the previous PR, and then include the changes of both PRs here (that will also make a easier to understand diff of the final changes), and then there is only a single PR to backport.

@jreback
Copy link
Contributor

jreback commented Aug 10, 2021

i am fine with this change.

@lithomas1
Copy link
Member Author

ping for merge @jreback. Just merged master

@jreback jreback merged commit 45fd72a into pandas-dev:master Aug 10, 2021
@jreback
Copy link
Contributor

jreback commented Aug 10, 2021

thanks @lithomas1

@lumberbot-app
Copy link

lumberbot-app bot commented Aug 10, 2021

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 1.3.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 45fd72aa1768d2132ab0c294f1cb208d666a8965
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #42954: Revert fastparquet nullable dtype support'
  1. Push to a named branch :
git push YOURFORK 1.3.x:auto-backport-of-pr-42954-on-1.3.x
  1. Create a PR against branch 1.3.x, I would have named this PR:

"Backport PR #42954 on branch 1.3.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@jreback
Copy link
Contributor

jreback commented Aug 10, 2021

@meeseeksdev backport 1.3.x

@lumberbot-app
Copy link

lumberbot-app bot commented Aug 10, 2021

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 1.3.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 45fd72aa1768d2132ab0c294f1cb208d666a8965
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #42954: Revert fastparquet nullable dtype support'
  1. Push to a named branch :
git push YOURFORK 1.3.x:auto-backport-of-pr-42954-on-1.3.x
  1. Create a PR against branch 1.3.x, I would have named this PR:

"Backport PR #42954 on branch 1.3.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@jreback
Copy link
Contributor

jreback commented Aug 10, 2021

@lithomas1 if you wouldn't mind do the manual backport here

@lithomas1 lithomas1 deleted the revert-fastparquet-nullable branch August 10, 2021 20:54
@simonjayhawkins
Copy link
Member

Basically backport the last PR and this PR together.

The net result is no release note. do we need one? It's not clear to me what is changed/fixed?

@jorisvandenbossche
Copy link
Member

Indeed, no release note, but the two combined PRs still have some changes to support the latest fastparquet version properly (in theory that could have been added as release note).

@simonjayhawkins
Copy link
Member

simonjayhawkins commented Aug 11, 2021

@lithomas1 if you wouldn't mind do the manual backport here

@lithomas1 what is added and then removed in the release notes is not identical, so have synced the notes in #42985, so no need to backport that change.

@lithomas1
Copy link
Member Author

Sorry, thanks for fixing that, planning on doing the backport now.

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

Successfully merging this pull request may close these issues.

None yet

5 participants