Skip to content

BUG: issubclass check with dtype instead of type, closes GH#24883 #35794

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

Merged
merged 5 commits into from
Aug 21, 2020

Conversation

jbrockmendel
Copy link
Member

@jbrockmendel jbrockmendel commented Aug 18, 2020

  • closes Pandas dataframe eval  #24883
  • tests added / passed
  • passes black pandas
  • passes git diff upstream/master -u -- "*.py" | flake8 --diff
  • whatsnew entry

@jreback jreback added this to the 1.2 milestone Aug 19, 2020
@jreback
Copy link
Contributor

jreback commented Aug 19, 2020

lgtm, can you add a whatsnew note.

@jbrockmendel
Copy link
Member Author

updated+green

@jreback jreback merged commit 7e91937 into pandas-dev:master Aug 21, 2020
@jbrockmendel jbrockmendel deleted the bug-24883 branch August 21, 2020 22:04
@simonjayhawkins
Copy link
Member

milestone 1.2 whatsnew 1.1.2 do you want this backported?

@jbrockmendel
Copy link
Member Author

i think so yes

@simonjayhawkins simonjayhawkins modified the milestones: 1.2, 1.1.2 Aug 27, 2020
@simonjayhawkins
Copy link
Member

@meeseeksdev backport 1.1.x

@lumberbot-app
Copy link

lumberbot-app bot commented Aug 27, 2020

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.1.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 7e919373236a538b9157359af9c7b8ca3d32e920
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #35794: BUG: issubclass check with dtype instead of type, closes GH#24883'
  1. Push to a named branch :
git push YOURFORK 1.1.x:auto-backport-of-pr-35794-on-1.1.x
  1. Create a PR against branch 1.1.x, I would have named this PR:

"Backport PR #35794 on branch 1.1.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.

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

Successfully merging this pull request may close these issues.

Pandas dataframe eval
3 participants