Skip to content

Removed __div__ impls from Cython #34718

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 3 commits into from
Jun 14, 2020
Merged

Conversation

WillAyd
Copy link
Member

@WillAyd WillAyd commented Jun 11, 2020

Alternate to #34711 which may close #34704

@WillAyd WillAyd added the Build Library building on various platforms label Jun 11, 2020
@WillAyd
Copy link
Member Author

WillAyd commented Jun 11, 2020

I believe failure is unrelated. Looking into it but @jbrockmendel might have some ideas as well given his comment here ref #33858:

# FIXME: This should probably be *fixed* not ignored.

@WillAyd
Copy link
Member Author

WillAyd commented Jun 11, 2020

Nevermind had the wrong PR. Looks like it might trace back to #22699

@jreback
Copy link
Contributor

jreback commented Jun 14, 2020

hmm what is this needed for?

@WillAyd
Copy link
Member Author

WillAyd commented Jun 14, 2020 via email

@jreback jreback added this to the 1.1 milestone Jun 14, 2020
@jreback jreback merged commit 7240ed4 into pandas-dev:master Jun 14, 2020
@jreback
Copy link
Contributor

jreback commented Jun 14, 2020

thanks

@simonjayhawkins
Copy link
Member

@meeseeksdev backport to 1.0.x

@lumberbot-app
Copy link

lumberbot-app bot commented Jun 15, 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.0.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 7240ed459e60c91e706940a0db72228c3c70beeb
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #34718: Removed __div__ impls from Cython'
  1. Push to a named branch :
git push YOURFORK 1.0.x:auto-backport-of-pr-34718-on-1.0.x
  1. Create a PR against branch 1.0.x, I would have named this PR:

"Backport PR #34718 on branch 1.0.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.

simonjayhawkins pushed a commit to simonjayhawkins/pandas that referenced this pull request Jun 15, 2020
@WillAyd WillAyd deleted the ununsed-div branch June 15, 2020 15:22
simonjayhawkins added a commit that referenced this pull request Jun 15, 2020
@simonjayhawkins simonjayhawkins modified the milestones: 1.1, 1.0.5 Jun 15, 2020
@simonjayhawkins
Copy link
Member

xref #34802

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

Successfully merging this pull request may close these issues.

BUG: CI builds failing at compilation of _sas
3 participants