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

CI Remove remaining windows 32 references #24657

Merged
merged 7 commits into from Oct 20, 2022

Conversation

thomasjpfan
Copy link
Member

@thomasjpfan thomasjpfan commented Oct 13, 2022

Reference Issues/PRs

Follow up to #24627

What does this implement/fix? Explain your changes.

This PR removes remaining windows 32bit code for building wheels.

@thomasjpfan thomasjpfan changed the title MNT Remove remaining windows 32 references MNT Remove remaining windows 32bit code for building wheels Oct 13, 2022
@thomasjpfan thomasjpfan changed the title MNT Remove remaining windows 32bit code for building wheels MNT Removes remaining windows 32bit code for building wheels Oct 13, 2022
@thomasjpfan thomasjpfan changed the title MNT Removes remaining windows 32bit code for building wheels CI Remove remaining windows 32 references Oct 13, 2022
@ogrisel
Copy link
Member

ogrisel commented Oct 14, 2022

LGTM but while the win64 build is not fixed it's hard to be 100% sure that this PR does not introduce any regression. Maybe we should wait for a maintenance release of scipy with scipy/scipy#17224 before merging this.

@cmarmo
Copy link
Member

cmarmo commented Oct 14, 2022

@thomasjpfan , I didn't check the details of this PR and I introduced the same changes in #24446 ... well, anyway, if you folks want to merge this one before, I will just merge in my branch.

Copy link
Member

@jjerphan jjerphan left a comment

Choose a reason for hiding this comment

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

LGTM!

I think this comment can be removed as well as we will from now on implicitly define 64bit configurations:

# NumPy on Python 3.10 only supports 64bit and is only available with manylinux2014

Copy link
Member

@ogrisel ogrisel left a comment

Choose a reason for hiding this comment

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

I merged @cmarmo's PR to main and merged main here. Only the cleanup of make_distributor_init_32_bits remains.

@jjerphan jjerphan merged commit 7c2a58d into scikit-learn:main Oct 20, 2022
@glemaitre glemaitre added the To backport PR merged in master that need a backport to a release branch defined based on the milestone. label Oct 26, 2022
@glemaitre glemaitre added this to the 1.1.3 milestone Oct 26, 2022
glemaitre pushed a commit to glemaitre/scikit-learn that referenced this pull request Oct 26, 2022
Co-authored-by: Julien Jerphanion <git@jjerphan.xyz>
Co-authored-by: Olivier Grisel <olivier.grisel@ensta.org>
glemaitre pushed a commit that referenced this pull request Oct 26, 2022
Co-authored-by: Julien Jerphanion <git@jjerphan.xyz>
Co-authored-by: Olivier Grisel <olivier.grisel@ensta.org>
glemaitre pushed a commit to glemaitre/scikit-learn that referenced this pull request Oct 31, 2022
Co-authored-by: Julien Jerphanion <git@jjerphan.xyz>
Co-authored-by: Olivier Grisel <olivier.grisel@ensta.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Build / CI To backport PR merged in master that need a backport to a release branch defined based on the milestone.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants