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

BLD/CI: fix py39 ci #36296 #36393

Merged
merged 7 commits into from
Sep 16, 2020
Merged

BLD/CI: fix py39 ci #36296 #36393

merged 7 commits into from
Sep 16, 2020

Conversation

fangchenli
Copy link
Member

@fangchenli fangchenli commented Sep 16, 2020

closes #36296

Need #36298 first.

@jreback
Copy link
Contributor

jreback commented Sep 16, 2020

go ahead and add the commit from #36298 here

@jreback jreback added Build Library building on various platforms Python 3.9 labels Sep 16, 2020
@jreback jreback added this to the 1.1.3 milestone Sep 16, 2020
pandas/_libs/writers.pyx Show resolved Hide resolved
@jreback
Copy link
Contributor

jreback commented Sep 16, 2020

ok can u add a note in 1.1.3 whats new that we support 3.9
also maybe need small edits in setup.py

and add a note that need cython==0.29.21 in the whats new as well

@jreback
Copy link
Contributor

jreback commented Sep 16, 2020

cc @pandas-dev/pandas-core

backporting this would bump the required cython for 1.1.3

alt we could release this as 1.2
(and bump current to 1.3)

i am ok with doing this to support 3.9

as this is not a runtime dep changing

@bashtage
Copy link
Contributor

Is Cython required for sdist builds or only for git repo builds?

@TomAugspurger
Copy link
Contributor

Is Cython required for sdist builds or only for git repo builds?

It's required for sdists, but we set it as a requirement in pyproject.toml so that users don't need it in their env ahead of time.

@TomAugspurger
Copy link
Contributor

I'm fine with bumping the Cython requirement. We just need to update it in a few places (setup.py, pyproject.toml, install.rst, ...)

@jreback
Copy link
Contributor

jreback commented Sep 16, 2020

@VirosaLi can you update the cython requirements in these places as well.

(setup.py, pyproject.toml, install.rst, ...)

@jreback
Copy link
Contributor

jreback commented Sep 16, 2020

@TomAugspurger @simonjayhawkins if you'd have a quick look.

@simonjayhawkins
Copy link
Member

I doubt this will autobackport because of differences in the ci setup. so I think OK to merge and then patch as needed if issues on 1.1.x or MacPython.

@jreback
Copy link
Contributor

jreback commented Sep 16, 2020

I doubt this will autobackport because of differences in the ci setup. so I think OK to merge and then patch as needed if issues on 1.1.x or MacPython.

@simonjayhawkins yep figured that.

@jreback jreback merged commit 11d5fc9 into pandas-dev:master Sep 16, 2020
@lumberbot-app
Copy link

lumberbot-app bot commented Sep 16, 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 11d5fc9e89ad8e238ece42890482bae875d9de98
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #36393: BLD/CI: fix py39 ci #36296'
  1. Push to a named branch :
git push YOURFORK 1.1.x:auto-backport-of-pr-36393-on-1.1.x
  1. Create a PR against branch 1.1.x, I would have named this PR:

"Backport PR #36393 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.

@jreback
Copy link
Contributor

jreback commented Sep 16, 2020

thanks @VirosaLi really nice!

@simonjayhawkins
Copy link
Member

@VirosaLi did you want to do the backport?

@fangchenli
Copy link
Member Author

@VirosaLi did you want to do the backport?

Sure, I'll do that later today.

fangchenli added a commit to fangchenli/pandas that referenced this pull request Sep 16, 2020
@@ -62,9 +62,6 @@ matrix:
- arch: arm64
env:
- JOB="3.7, arm64" PYTEST_WORKERS=8 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard)"
- dist: bionic
Copy link
Member

Choose a reason for hiding this comment

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

How come we have removed this @VirosaLi did we move 3.9 build to Azure?

Copy link
Member Author

Choose a reason for hiding this comment

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

How come we have removed this @VirosaLi did we move 3.9 build to Azure?

It was removed from allow_failures.

Copy link
Member

Choose a reason for hiding this comment

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

Ahh thanks misread the diff

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.

BLD/CI: 3.9 support
6 participants