Skip to content
This repository was archived by the owner on Feb 14, 2023. It is now read-only.

Include vcomp140.dll in windows wheels#43

Merged
ogrisel merged 12 commits intoMacPython:masterfrom
ogrisel:include-vcomp140.dll
Jan 2, 2020
Merged

Include vcomp140.dll in windows wheels#43
ogrisel merged 12 commits intoMacPython:masterfrom
ogrisel:include-vcomp140.dll

Conversation

@ogrisel
Copy link
Copy Markdown
Contributor

@ogrisel ogrisel commented Dec 18, 2019

This is a tentative fix for:

scikit-learn/scikit-learn#15899

@ogrisel ogrisel mentioned this pull request Dec 18, 2019
Closed
@ogrisel ogrisel mentioned this pull request Dec 19, 2019
Merged
jeremiedbb
jeremiedbb reviewed Dec 19, 2019
View reviewed changes
jeremiedbb
jeremiedbb reviewed Dec 19, 2019
View reviewed changes
ogrisel and others added 4 commits December 19, 2019 19:25
@ogrisel @jeremiedbb
Update appveyor/vendor_vcomp140.py
2e91056 
[ci skip]

Co-Authored-By: Jérémie du Boisberranger <34657725+jeremiedbb@users.noreply.github.com>
@ogrisel @jeremiedbb
Update appveyor/vendor_vcomp140.py
175064a 
[ci skip]

Co-Authored-By: Jérémie du Boisberranger <34657725+jeremiedbb@users.noreply.github.com>
@ogrisel @jeremiedbb
Update appveyor/vendor_vcomp140.py
f4e4846 
[ci skip]

Co-Authored-By: Jérémie du Boisberranger <34657725+jeremiedbb@users.noreply.github.com>
@ogrisel
Fix indent [ci skip]
6e68a76
@ogrisel
Copy link
Copy Markdown
Contributor Author

ogrisel commented Dec 19, 2019

Comments addressed. Thanks for the review.

@ogrisel ogrisel requested a review from rth December 19, 2019 19:41
@thomasjpfan thomasjpfan mentioned this pull request Dec 19, 2019
Closed
thomasjpfan
thomasjpfan reviewed Dec 20, 2019
View reviewed changes
Copy link
Copy Markdown
Collaborator

@thomasjpfan thomasjpfan left a comment

Choose a reason for hiding this comment

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

Now that scikit-learn/scikit-learn#15929 is merged, we can update this to target the main project.

I tested this on a new Windows 10 VM with python 3.8, where the pypi wheel failed and the artifact generated by this PR works.

@ogrisel
Copy link
Copy Markdown
Contributor Author

ogrisel commented Dec 20, 2019

I have not yet back-ported scikit-learn/scikit-learn#15929 to the 0.22.X branch yet, so this PR is targeting the master branch for now.

I will update again once the 0.22.1 PR is ready (there are still issues to fix on the milestone).

@ogrisel
Copy link
Copy Markdown
Contributor Author

ogrisel commented Dec 20, 2019

I tested this on a new Windows 10 VM with python 3.8, where the pypi wheel failed and the artifact generated by this PR works.

Thanks for the additional manual confirmation :)

@ogrisel
Copy link
Copy Markdown
Contributor Author

ogrisel commented Jan 2, 2020

The random appveyor failure had also been observed elsewhere in the past and is being fixed here: scikit-learn/scikit-learn#16003

@ogrisel ogrisel merged commit 979cc8b into MacPython:master Jan 2, 2020
@ogrisel ogrisel deleted the include-vcomp140.dll branch January 2, 2020 14:53
@glemaitre glemaitre mentioned this pull request Aug 4, 2020
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@adrinjalali adrinjalali Awaiting requested review from adrinjalali

@rth rth Awaiting requested review from rth

2 more reviewers

@thomasjpfan thomasjpfan thomasjpfan left review comments

@jeremiedbb jeremiedbb jeremiedbb left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ogrisel @thomasjpfan @jeremiedbb