Allow maingo_solvermodel to be imported without maingopy#3330
Merged
mrmundt merged 1 commit intoPyomo:mainfrom Jul 25, 2024
Merged
Allow maingo_solvermodel to be imported without maingopy#3330mrmundt merged 1 commit intoPyomo:mainfrom
mrmundt merged 1 commit intoPyomo:mainfrom
Conversation
blnicho
approved these changes
Jul 25, 2024
mrmundt
approved these changes
Jul 25, 2024
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #3330 +/- ##
==========================================
+ Coverage 88.30% 88.50% +0.20%
==========================================
Files 868 868
Lines 98436 98418 -18
==========================================
+ Hits 86928 87109 +181
+ Misses 11508 11309 -199
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes # .
Summary/Motivation:
This resolves recent test failures in the GHA singletest job. MAiNGOpy (@MAiNGO-github) released a new version yesterday (8.1) that only included wheels for Windows. Unfortunately, the MAiNGOpy
setup.pyhas an unconditional required import ofskbuild(which is not present in the Pyomo GHA environment), so the build ofmaingopyfails on Linux & OSX. This highlighted that thepyomo.contrib.appsi.solvers.maingo_solvermodelmodule is not importable withoutmaingopy(leading to the test failure).This PR resolves that test failure (but not the availability of
maingopyon GHA Linux / OSX builds).Changes proposed in this PR:
maingopywithin theappsi_maingosolver so that module imports do not fail ifmaingopyis missingLegal Acknowledgement
By contributing to this software project, I have read the contribution guide and agree to the following terms and conditions for my contribution: