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

Fix error when xpress is imported before xpress_direct #3410

Merged
merged 1 commit into from
Nov 8, 2024

Conversation

jsiirola
Copy link
Member

@jsiirola jsiirola commented Nov 7, 2024

Fixes #3406 .

Summary/Motivation:

This resolves a NameError if xpress was imported before xpress_direct

Changes proposed in this PR:

  • Ensure XpressDirect is declared before attempting the xpress import

Legal Acknowledgement

By contributing to this software project, I have read the contribution guide and agree to the following terms and conditions for my contribution:

  1. I agree my contributions are submitted under the BSD license.
  2. I represent I am authorized to make the contributions and grant the license. If my employer has rights to intellectual property that includes these contributions, I represent that I have received permission to make contributions and grant the required license on behalf of that employer.

Copy link

codecov bot commented Nov 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.66%. Comparing base (952e67b) to head (22a9dd1).
Report is 30 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #3410   +/-   ##
=======================================
  Coverage   88.66%   88.66%           
=======================================
  Files         879      879           
  Lines      100365   100365           
=======================================
+ Hits        88991    88992    +1     
+ Misses      11374    11373    -1     
Flag Coverage Δ
linux 86.12% <100.00%> (+<0.01%) ⬆️
osx 76.11% <100.00%> (+<0.01%) ⬆️
other 86.62% <100.00%> (+<0.01%) ⬆️
win 84.46% <100.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jsiirola jsiirola merged commit 364e7f1 into Pyomo:main Nov 8, 2024
32 checks passed
@jsiirola jsiirola deleted the xpress-import branch November 8, 2024 17:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

XpressDirect interface fails if xpress imported first
3 participants