Skip to content

BLD: Pin cython for 37-locale build #34711

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 2 commits into from
Jun 11, 2020
Merged

Conversation

TomAugspurger
Copy link
Contributor

Seeing if this resolves the build failure.

xref #34704

Seeing if this resolves the build failure.

xref pandas-dev#34704
@TomAugspurger TomAugspurger added this to the 1.0.5 milestone Jun 11, 2020
@TomAugspurger TomAugspurger added the Build Library building on various platforms label Jun 11, 2020
@jorisvandenbossche
Copy link
Member

Also the Checks and Docs github action builds are failing, and those use the main environment.yml I think?

@WillAyd WillAyd merged commit a1191d6 into pandas-dev:master Jun 11, 2020
@WillAyd
Copy link
Member

WillAyd commented Jun 11, 2020

Thanks @TomAugspurger

@WillAyd
Copy link
Member

WillAyd commented Jun 11, 2020

Though looks like we still have this pinned here:

- cython==0.29.16 # GH#34014

I can push a follow up PR. We might not even need that any more

@jorisvandenbossche
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 a1191d6fb2d21631e1d4fb2c558d5c66c5ea3bdf
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #34711: BLD: Pin cython for 37-locale build'
  1. Push to a named branch :
git push YOURFORK 1.0.x:auto-backport-of-pr-34711-on-1.0.x
  1. Create a PR against branch 1.0.x, I would have named this PR:

"Backport PR #34711 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
Copy link
Member

@jorisvandenbossche will do this next

@WillAyd
Copy link
Member

WillAyd commented Jun 15, 2020

We actually don’t need to backport this can just do #34718

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.

4 participants