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

MAINT: more 1.9.2 backports prep #17150

Conversation

tylerjereddy
Copy link
Contributor

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 did git checkout -p main -- .github/workflows/wheels.yml and applied the third hunk of the diff.

mckib2 and others added 3 commits October 4, 2022 20:53
…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
@tylerjereddy tylerjereddy added the maintenance Items related to regular maintenance tasks label Oct 5, 2022
@tylerjereddy tylerjereddy added this to the 1.9.2 milestone Oct 5, 2022
@andyfaff
Copy link
Contributor

andyfaff commented Oct 5, 2022

The wheels.yml changes look ok, in that it matches main. However, whether it works or not is another matter!

@mdhaber
Copy link
Contributor

mdhaber commented Oct 5, 2022

@mckib2 I think we need to remove that test in main while we search for a better test problem. That timeout is too long, and the time_limit is too long, too.
@tylerjereddy I forgot that gh-16814 also passed a new option to HiGHS. That might not be appropriate for a bug fix release. I can try to cut that out tomorrow.

@tylerjereddy
Copy link
Contributor Author

@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 cibuildwheel checking pretty soon.

@mdhaber
Copy link
Contributor

mdhaber commented Oct 5, 2022

gh-17055 is fine; only gh-16814 needs adjustment. If you need to revert wholesale due to time crunch, I understand, but if I would have time to work on it this evening (not weekend, which I accidentally wrote originally), I can find just the parts of it that need to be removed.

@rgommers
Copy link
Member

rgommers commented Oct 5, 2022

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.

@tylerjereddy
Copy link
Contributor Author

@mdhaber happy on your end here?

Copy link
Contributor

@mdhaber mdhaber left a 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.)

@tylerjereddy
Copy link
Contributor Author

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).

@tylerjereddy tylerjereddy merged commit d9ad980 into scipy:maintenance/1.9.x Oct 8, 2022
@tylerjereddy tylerjereddy deleted the treddy_scipy_192_more_backports branch October 8, 2022 03:53
@tylerjereddy
Copy link
Contributor Author

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.

@andyfaff
Copy link
Contributor

andyfaff commented Oct 8, 2022

Check that all the macosx_arm64 wheels are tagged 12_0 not 11_0

@tylerjereddy
Copy link
Contributor Author

Wheel builds now running after making small adjustment from gh-17171 : https://github.com/scipy/scipy/actions/runs/3211264776

@tylerjereddy
Copy link
Contributor Author

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 main already, but if I'm wrong about that then please do open an issue.

-rw-rw-r-- 1 treddy treddy 28M Oct  8  2022 scipy-1.9.2-cp310-cp310-macosx_11_0_arm64.whl
-rw-rw-r-- 1 treddy treddy 28M Oct  8  2022 scipy-1.9.2-cp311-cp311-macosx_11_0_arm64.whl
-rw-rw-r-- 1 treddy treddy 28M Oct  8  2022 scipy-1.9.2-cp38-cp38-macosx_11_0_arm64.whl
-rw-rw-r-- 1 treddy treddy 28M Oct  8  2022 scipy-1.9.2-cp39-cp39-macosx_11_0_arm64.whl

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.

@andyfaff
Copy link
Contributor

andyfaff commented Oct 8, 2022

The 11_0 --> 12_0 renaming is fixed on main.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintenance Items related to regular maintenance tasks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants