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
MAINT: more 1.9.2 backports prep #17150
MAINT: more 1.9.2 backports prep #17150
Conversation
…node limit (scipy#16814) * FIX: optimize.milp: return feasible solution if available on timeout/node limit Co-authored-by: Matt Haberland <mhaberla@calpoly.edu> Co-authored-by: laenNoCode <36074576+laenNoCode@users.noreply.github.com>
* update 1.9.2 relnotes * uncomment wheel upload code
The |
@mckib2 I think we need to remove that test in |
@mdhaber so, I should revert one of the backports, or do both need some adjustment? If they aren't crucial it may be better to focus on final |
You can keep the fix but remove the timeout test completely. There's no real need for a test backport here. The fix itself seems fine still, just the test is not reliable. |
@mdhaber happy on your end here? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. It all looks good, and I've tested locally and it all seems to be working. (Did you want me to merge? Not sure if you typically squash these.)
I'll probably merge it today thanks. We don't usually squash, instead keeping the individual backports (which themselves are typically squashed on merge in their individual PRs). |
Thanks for the help all, the delay here is just me now. I'll see what I can do this weekend. I'll probably wait until tomorrow (Saturday) to start the process since it will be slightly different and I'll want to be a little careful. |
Check that all the |
Wheel builds now running after making small adjustment from gh-17171 : https://github.com/scipy/scipy/actions/runs/3211264776 |
The arm64 wheels will indeed need renaming. I won't open an issue for that because I was under the impression this may be smoother on
I opened two smaller issues for convenience matters on the upload/workflow side, but so far things are probably still faster even with me manually unzipping artifacts, so that's good and my complaints look pretty easy to address I think. |
The 11_0 --> 12_0 renaming is fixed on main. |
Backport (with merge conflicts manually resolved, please check):
Uncomment the wheel upload code as suggested in #17132 (review). To produce a match to
main
for the upload block I didgit checkout -p main -- .github/workflows/wheels.yml
and applied the third hunk of the diff.