Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3909 commits
Select commit Hold shift + click to select a range
11fa674
Merge pull request #3548 from jsiirola/cmake-3.5-fix
jsiirola Mar 31, 2025
e97567e
Merge branch 'main' into example-imports
mrmundt Mar 31, 2025
8f07dc9
Merge pull request #3538 from emma58/params-complain-more
jsiirola Apr 1, 2025
f7fc053
Merge branch 'main' into relational-multiple-dispatch
jsiirola Apr 1, 2025
88f0dd4
Retry gc colelction (fix intermittent pypy failure)
jsiirola Apr 1, 2025
df806df
Update codecov-action version, remove unnecesary step
jsiirola Apr 1, 2025
1d2b57d
Update codecov config
jsiirola Apr 1, 2025
0357523
Add PYOMO_WORKFLOW env var, reduce diffs between workflows
jsiirola Apr 1, 2025
e6f61d8
GHA doesn't support conditions in 'needs:'
jsiirola Apr 1, 2025
053503b
GHA doesn't support empty 'needs:'
jsiirola Apr 1, 2025
8b82af8
Merge branch 'main' into ldsda_documentation
blnicho Apr 1, 2025
2c610bb
Merge branch 'main' into pyros-discrete-coefficient-matching
blnicho Apr 1, 2025
3f0ea8b
Switch from env to input for subworkflow flag
jsiirola Apr 1, 2025
4f5a555
Move inputs definition
jsiirola Apr 1, 2025
d4c2899
Debugging
jsiirola Apr 1, 2025
522ea50
Add missing type
jsiirola Apr 1, 2025
418955a
Add missing type
jsiirola Apr 1, 2025
19f98d0
Revert to env.PYOMO_WORKFLOW, hardcode job-level if
jsiirola Apr 1, 2025
734f97d
NFC: fix typo
jsiirola Apr 1, 2025
792e114
Increase test attempts
jsiirola Apr 1, 2025
b49900b
Merge remote-tracking branch 'origin' into example-imports
mrmundt Apr 1, 2025
620b9af
Apply some requested changes; another round incoming
mrmundt Apr 1, 2025
9e4ab49
Decorator syntax whoops
mrmundt Apr 1, 2025
3d32f10
All the comment corrections
mrmundt Apr 1, 2025
fa15cc7
Merge pull request #3549 from jsiirola/testing-and-coverage-fixes
jsiirola Apr 1, 2025
0679023
Changed the old standard of import * into pyo for the LDSDA documenta…
AlbertLee125 Apr 2, 2025
804359e
Merge branch 'ldsda_documentation' of https://github.com/AlbertLee125…
AlbertLee125 Apr 2, 2025
99d1be3
Merge branch 'main' into relational-multiple-dispatch
jsiirola Apr 2, 2025
2f5ac1f
NFC: address reviewer comment
jsiirola Apr 2, 2025
99d6efb
Fix GDPopt-LDSDA documentation by adding pyo.
AlbertLee125 Apr 2, 2025
00ebb73
Renewed the documentation of the LBB example code.
AlbertLee125 Apr 2, 2025
4cc31df
Update GDPopt LOA documentation to use explicit pyo imports
AlbertLee125 Apr 2, 2025
015a010
Merge branch 'main' into ldsda_documentation
blnicho Apr 2, 2025
0fa9c2b
Merge branch 'main' into pyomo-doe-fix-initialization
blnicho Apr 2, 2025
3566b54
Fix reformulation function docstring typo
shermanjasonaf Apr 2, 2025
0dd943b
numeric_expr tests: Copy arguments before applying operator
jsiirola Apr 2, 2025
42735c3
Update test baselines to not reference mutable args in results
jsiirola Apr 2, 2025
f592b94
Merge pull request #3539 from AlbertLee125/ldsda_documentation
mrmundt Apr 2, 2025
c977e5b
Merge remote-tracking branch 'me/numeric_expr-test-driver' into relat…
jsiirola Apr 3, 2025
c2d60e2
Reverse the priority for resolving generic asnumeric/mutable/invalid …
jsiirola Apr 3, 2025
fea56b1
Update docs / fix grammar typo
jsiirola Apr 3, 2025
69f5f4f
Support testing exception message in the dispatch tester
jsiirola Apr 3, 2025
f1bc18f
Add dispatcher tests for equality expressions
jsiirola Apr 3, 2025
2aa4fcf
Add testing for <= dispatcher
jsiirola Apr 3, 2025
353c9a9
Comparing expressions should check Inequality strict-ness
jsiirola Apr 3, 2025
7b636d1
Add strict inequality dispatcher tests
jsiirola Apr 3, 2025
7eec611
Update tests to track change in inequality representation
jsiirola Apr 3, 2025
e1509c2
NFC: apply black
jsiirola Apr 3, 2025
ac5d88d
NFC: fix typo
jsiirola Apr 3, 2025
3bbcbcb
Update version number and changelog
shermanjasonaf Apr 3, 2025
89ffe76
Merge branch 'pyros-discrete-coefficient-matching' of github.com:sher…
shermanjasonaf Apr 3, 2025
92ca179
Fix doc links; also a weird usage of pyomo.environ in kernel
mrmundt Apr 3, 2025
9ee797e
Remove redundancy
mrmundt Apr 3, 2025
50129d0
Revert changes for plurality
mrmundt Apr 3, 2025
cfc0850
Merge pull request #3551 from jsiirola/numeric_expr-test-driver
blnicho Apr 3, 2025
1f5e1e7
Merge branch 'main' into relational-multiple-dispatch
blnicho Apr 3, 2025
166119a
Merge pull request #3543 from mrmundt/example-imports
blnicho Apr 4, 2025
69328c0
Merge branch 'main' into solvers2
michaelbynum Apr 4, 2025
f3d36a6
working on dual sign convention
michaelbynum Apr 8, 2025
3013edc
testing dual sign convention for maximization problems
michaelbynum Apr 8, 2025
466beb3
dual sign convention
michaelbynum Apr 8, 2025
43c92e6
run black
michaelbynum Apr 8, 2025
da9befd
Relax DF initializer to accept multi-column DataFrames
jsiirola Apr 8, 2025
d329ee1
Merge pull request #3483 from jsiirola/relational-multiple-dispatch
mrmundt Apr 8, 2025
5e49df7
Merge pull request #3552 from jsiirola/pandas-df-initializer
blnicho Apr 8, 2025
e541608
Remove duplicates from AMPLFUNC environment variable
jsiirola Apr 8, 2025
043def5
Add moved_module deprecation for contrib.solver
mrmundt Apr 8, 2025
ea5b826
Rework amplfunc_merge: remove assumptions, allow user-defined values
jsiirola Apr 8, 2025
3d27886
Merge branch 'main' into solver-dep-warn
mrmundt Apr 8, 2025
3710b7d
Merge branch 'main' into feature/support_for_knitro_python_package
jsiirola Apr 9, 2025
5aa3663
Remove loud deprecation warning
mrmundt Apr 9, 2025
d2dc334
Merge pull request #3553 from mrmundt/solver-dep-warn
mrmundt Apr 9, 2025
b9a24a8
Whoops - missed a test update
mrmundt Apr 9, 2025
c811203
Update doc class links
mrmundt Apr 9, 2025
ad32d1c
Sigh, it's a Wednesday
mrmundt Apr 9, 2025
2bf836b
More concise syntax
mrmundt Apr 9, 2025
d79fb61
Missed another solution_loader
mrmundt Apr 9, 2025
2978f34
Install ipopt on osx on branch tests
mrmundt Apr 9, 2025
9e17d04
Port to PR tests
mrmundt Apr 9, 2025
586ac19
Try different tar because -i doesn't work on Mac
mrmundt Apr 9, 2025
e247d90
One mor e missed doctest
mrmundt Apr 9, 2025
583e68e
Try DYLD path and revert windows logic
mrmundt Apr 9, 2025
a3a0f7d
Merge pull request #3555 from mrmundt/remove-legacy-warning
mrmundt Apr 9, 2025
6018b70
NFC: fix typo
jsiirola Apr 9, 2025
6c05592
Merge branch 'main' into amplfunc-duplicates
jsiirola Apr 9, 2025
d1a507f
Merge pull request #3533 from shermanjasonaf/pyros-discrete-coefficie…
mrmundt Apr 9, 2025
cde349e
cleanup unused imports
tvignon-artelys Apr 10, 2025
3a4081f
Merge branch 'feature/support_for_knitro_python_package' of https://g…
tvignon-artelys Apr 10, 2025
2918612
Test external functions in ipopt_v2
jsiirola Apr 10, 2025
8f9b5be
Update tests to not call deprecated API
jsiirola Apr 10, 2025
09a3258
update copyright
tvignon-artelys Apr 10, 2025
87cef7b
unused imports
tvignon-artelys Apr 10, 2025
f7c3606
Remove an unnecessary call to flush()
jsiirola Apr 11, 2025
d188146
Add a small delay between GC collects
jsiirola Apr 11, 2025
020c6ce
Ensure context stack is unwound
jsiirola Apr 11, 2025
a70451d
Merge pull request #3478 from tvignon-artelys/feature/support_for_kni…
jsiirola Apr 11, 2025
2697cf1
Remove previous attempt, move from footer to sidebar
jsiirola Apr 11, 2025
b710209
Update layout template
jsiirola Apr 11, 2025
9bb7217
Remove unneeded configuration
jsiirola Apr 11, 2025
29774ad
Try shrinking the ads just a bit
jsiirola Apr 11, 2025
a1f91e6
Shrink the ad box slightly, and center
jsiirola Apr 11, 2025
27b1dd6
Fix typo in PyROS docs (output line numbering)
jsiirola Apr 11, 2025
e80b774
Try to get the ads to render in dark mode
jsiirola Apr 11, 2025
0c339db
Add time interpolation to mpc data
Apr 11, 2025
c286a0a
Run black
Apr 11, 2025
58c60c4
Fix formatting
Apr 11, 2025
8206bbc
NFC: fix typo
jsiirola Apr 11, 2025
a6568ff
Merge branch 'main' into tee-test-fixes
jsiirola Apr 11, 2025
09c6abd
Merge branch 'Pyomo:main' into master
Utkarsh-Detha Apr 13, 2025
5c21d85
Changes:
Utkarsh-Detha Apr 14, 2025
2175c07
Ran formatter on test_MOSEKDirect.py
Utkarsh-Detha Apr 14, 2025
c1625b9
Merge pull request #3560 from jsiirola/tee-test-fixes
jsiirola Apr 14, 2025
0b58294
Merge pull request #3554 from jsiirola/amplfunc-duplicates
blnicho Apr 14, 2025
75ea520
Merge branch 'main' into rtd-ads
jsiirola Apr 14, 2025
0c74168
Address review comment: explain why we are placing the ads
jsiirola Apr 14, 2025
e79c378
Merge branch 'Pyomo:main' into master
Utkarsh-Detha Apr 14, 2025
dca2dc4
1. Switched to using pyo.SolverFactory
Utkarsh-Detha Apr 14, 2025
8970b61
Added TypeError check to param passing funcitonality tests
Utkarsh-Detha Apr 14, 2025
dab4a8c
Split interpolate to a seperate function.
Apr 14, 2025
e888fbb
Fix function call
Apr 14, 2025
fa88cfb
formatting
Apr 14, 2025
3136342
Switch off PyROS DR efficiency for problems with DR-dependent 1-stg e…
shermanjasonaf Apr 15, 2025
b3172d3
Merge branch 'Pyomo:main' into pyros-discrete-coefficient-matching
shermanjasonaf Apr 15, 2025
bb610f5
Account for effective uncertain params in DR efficiency
shermanjasonaf Apr 15, 2025
19fa8ce
Remove test result file added to repo
jsiirola Apr 15, 2025
aca625e
Add pathlib to the list of deferred imports in common.dependencies
jsiirola Apr 15, 2025
ae863b6
Merge pull request #3532 from adowling2/pyomo-doe-fix-initialization
blnicho Apr 15, 2025
28b0df9
Merge pull request #3536 from jsiirola/rtd-ads
blnicho Apr 15, 2025
5ae07c8
Merge pull request #3556 from mrmundt/mac-idaes-ext
blnicho Apr 15, 2025
bbc4f8b
Merge branch 'main' into mpc_time_interp
jsiirola Apr 15, 2025
c5a50b7
Merge pull request #3563 from jsiirola/imports-and-tests
jsiirola Apr 15, 2025
9a3afc4
Merge branch 'main' into master
mrmundt Apr 15, 2025
7b7c7cd
FBT: resolve bug registering native type handlers
jsiirola Apr 15, 2025
007b8e9
add test demonstrating issue
Apr 15, 2025
ad32214
change column type before changing bounds
Apr 15, 2025
187b3e0
Update CHANGELOG for 6.9.2
mrmundt Apr 15, 2025
dceceb1
Merge pull request #3567 from jsiirola/fbbt-numpy
jsiirola Apr 16, 2025
b1f97d7
Merge branch 'Pyomo:main' into master
Utkarsh-Detha Apr 16, 2025
6f2a50e
Merge pull request #3566 from bknueven/issue-3565
jsiirola Apr 16, 2025
b3b0e4e
Merge branch 'Pyomo:main' into master
Utkarsh-Detha Apr 16, 2025
86ec82c
1. Removed elif-else from iparam parsing. Idea is to raise TypeErrors…
Utkarsh-Detha Apr 16, 2025
ae2750e
Merge pull request #3562 from shermanjasonaf/pyros-discrete-coefficie…
jsiirola Apr 16, 2025
e8ec2f9
Merge branch 'Pyomo:main' into master
Utkarsh-Detha Apr 16, 2025
11f744b
Added Value/AssertionError to guard against MOSEK parameter input edg…
Utkarsh-Detha Apr 16, 2025
d03fc1d
Two more PRs merged
mrmundt Apr 16, 2025
12e222a
Fix some language
mrmundt Apr 16, 2025
fafafff
changelog updates
jsiirola Apr 16, 2025
4c6b95c
Finalize Pyomo for 6.9.2
mrmundt Apr 16, 2025
653220a
Merge pull request #3488 from Utkarsh-Detha/master
mrmundt Apr 16, 2025
a2829e5
Merge branch 'main' into finalize-release-6.9.2
mrmundt Apr 16, 2025
0c65644
Merge pull request #3568 from mrmundt/finalize-release-6.9.2
mrmundt Apr 16, 2025
b57345c
Resetting main for development (6.9.3.dev0)
mrmundt Apr 16, 2025
b7ea8ce
Merge pull request #3569 from mrmundt/finalize-release-6.9.2
mrmundt Apr 16, 2025
60ca7c6
Merge branch 'main' of https://github.com/pyomo/pyomo into mpc_time_i…
Apr 23, 2025
789a795
Update function name and range check
Apr 23, 2025
d63dea3
Merge branch 'mpc_time_interp' of https://github.com/eslickj/pyomo in…
Apr 23, 2025
4c2ed3e
Update available solver jobs
mrmundt Apr 24, 2025
acbf764
Update docs and comment
mrmundt Apr 24, 2025
ede27a9
Alphabetize
mrmundt Apr 24, 2025
7ba4117
Update descriptions
mrmundt Apr 24, 2025
c673122
Fix ineq
Apr 24, 2025
19e9142
undo change
Apr 24, 2025
42a2ebe
Turn off NEOS test again
mrmundt Apr 24, 2025
e5c6e47
Turn 'on' test but it just skips
mrmundt Apr 24, 2025
79e2acb
Merge pull request #3576 from mrmundt/neos-support-2025
mrmundt Apr 24, 2025
53e5af6
Merge branch 'main' of https://github.com/pyomo/pyomo into mpc_time_i…
Apr 25, 2025
3a4b9c5
Add test at inter pendpoints
Apr 25, 2025
c3f657c
Evaluate name in message
emmanuel-ferdman Apr 25, 2025
1f46931
Merge pull request #3580 from emmanuel-ferdman/main
mrmundt Apr 28, 2025
fdf829f
Issue 3579: Logfile path with spaces
mrmundt Apr 28, 2025
2106be7
Extra print statements
mrmundt Apr 28, 2025
4d5f2e0
More manual approach
mrmundt Apr 28, 2025
0aeaa5b
Does it actually fail?
mrmundt Apr 28, 2025
7fc5cf0
Let's see if we can do it using f-strings
mrmundt Apr 29, 2025
3448940
Add some printing and change it again
mrmundt Apr 29, 2025
3ec8925
Try mixing f and r strings
mrmundt Apr 29, 2025
1ec2c7c
More syntax fun
mrmundt Apr 29, 2025
4a9f071
Removing octeract from list of NEOS solvers
blnicho Apr 29, 2025
e8f0960
Ensure TeeStream outputs are flushed when closed
jsiirola Apr 29, 2025
216781e
Relax test tolerances due to changes in Xpress 45.1.1
jsiirola Apr 29, 2025
d63dbae
NFC: apply black
jsiirola Apr 29, 2025
7a33ac4
Support numpy2: BlockVector.__getitem__(()) is identity
jsiirola Apr 29, 2025
381f3d9
Merge pull request #3584 from jsiirola/xpress-tol-update
mrmundt Apr 29, 2025
4f002bd
Merge pull request #3582 from blnicho/disable-octeract
mrmundt Apr 29, 2025
55d55a6
Merge pull request #3585 from jsiirola/block-vector-numpy2
mrmundt Apr 29, 2025
da8c0d7
Merge branch 'main' into flush-teestream
jsiirola Apr 29, 2025
175353c
Merge pull request #3583 from jsiirola/flush-teestream
mrmundt Apr 30, 2025
36d5265
TeeStream: guard against repeated calls to close()
jsiirola Apr 30, 2025
824f75b
TeeStream: improve cleanup when handling exceptions
jsiirola Apr 30, 2025
4e7cf06
Avoid exception if TeeStream closed before capture_output exits
jsiirola Apr 30, 2025
35f4a88
Tolerate (and test) TeeStream output closed before TeeStream exited
jsiirola Apr 30, 2025
a074e63
NFC: apply black
jsiirola Apr 30, 2025
b11f7d0
Merge branch 'main' into mpc_time_interp
blnicho Apr 30, 2025
53b1ecd
Explicitly close file descriptors to work around Python on Windows
jsiirola Apr 30, 2025
086928c
NFC: apply black
jsiirola Apr 30, 2025
2d7e94e
Ensure FD is closed after TextIO object
jsiirola Apr 30, 2025
fe49a2a
Improve error reporting
jsiirola Apr 30, 2025
f8fe130
Update test baseline to account for FD context
jsiirola Apr 30, 2025
9c968a4
Merge remote-tracking branch 'origin' into issue-3579
mrmundt May 1, 2025
f69b04e
Quote only if needed
mrmundt May 1, 2025
26ccc2b
Trying a different way
mrmundt May 1, 2025
acf7a2a
Try win short path instead
mrmundt May 1, 2025
a43e2ff
Change again
mrmundt May 1, 2025
9820850
Yet another short-path atteempt
mrmundt May 1, 2025
32591c1
Merge pull request #3588 from jsiirola/tee-close-errors
blnicho May 1, 2025
8230e5b
Merge branch 'main' into mpc_time_interp
blnicho May 1, 2025
0910ced
Merge branch 'Pyomo:main' into issue-3579
mrmundt May 1, 2025
09124e4
Update pyomo/contrib/mpc/data/interpolation.py
eslickj May 6, 2025
7eb0e97
Update pyomo/contrib/mpc/data/interpolation.py
eslickj May 6, 2025
0e31c8d
Update doc string to include indexes
May 6, 2025
cf730a6
Merge branch 'main' into solvers2
mrmundt May 6, 2025
498f0fb
Attempting to fix the LaTeX
mrmundt May 6, 2025
43079bd
Rename utility
mrmundt May 6, 2025
3624e0f
Respond to jsiirola's change request
mrmundt May 6, 2025
d82b87f
Merge pull request #3528 from michaelbynum/solvers2
blnicho May 6, 2025
1c537d9
add a test to ensure new solver interfaces get tested
michaelbynum May 6, 2025
71e2433
run black
michaelbynum May 6, 2025
60e31ad
Merge branch 'main' into solver_tests
mrmundt May 6, 2025
5df0a00
Merge pull request #3595 from mrmundt/issue-3579
mrmundt May 6, 2025
86f5f05
Merge pull request #3598 from michaelbynum/solver_tests
blnicho May 6, 2025
0a25e00
Run black
May 7, 2025
457f436
Merge pull request #3559 from eslickj/mpc_time_interp
blnicho May 7, 2025
bb68b14
WIP: adding log statements to trace path of template to solving with …
jd-nm26 Mar 27, 2025
eef51c1
WIP: got rid of some old print statements used for debugging
jd-nm26 Mar 27, 2025
1ba4d23
WIP: using gurobi_model.addMQConstr() to add *linear-only* constraint…
jd-nm26 Apr 23, 2025
49f33cb
WIP: forming initial Q matrix, need to make it an array so it can be …
jd-nm26 Apr 1, 2025
d3b7f78
WIP: creating quadratic Q matrices
jd-nm26 Apr 7, 2025
1fc263d
WIP: solving quadratic and linear non-template constraints
jd-nm26 Apr 7, 2025
a6a8aa7
WIP: some cleanup
jd-nm26 Apr 7, 2025
e90c84a
WIP: FIXED: hard-coded Q shape (2,2) -> (n_cols,n_cols)
jd-nm26 Apr 8, 2025
3c312cf
WIP: base (completely inherited) QuadraticTemplateRepn and QuadraticT…
jd-nm26 Apr 9, 2025
3fcf446
WIP: expanded QuadraticTemplateRepn to include functions from LinearT…
jd-nm26 Apr 9, 2025
c9ab0d7
WIP: added QuadraticRepnVisitor.finalizeResult() to handle quadratic …
jd-nm26 Apr 11, 2025
9f1ee1b
WIP: forming quadratic build_expr function, but NOT solving quadratic…
jd-nm26 Apr 12, 2025
6f241bd
WIP: single quadratic+linear+constant template constraint gets solved!
jd-nm26 Apr 13, 2025
382b77e
WIP: multiple quadratic+linear+constant constraint solved! (FIXED: bu…
jd-nm26 Apr 14, 2025
ba4e7cf
WIP: works with multiple quadratic+linear+constant, multiple linear, …
jd-nm26 Apr 14, 2025
5ccebe5
WIP: writing quadratic matrix objective with decorator objective (doe…
jd-nm26 Apr 19, 2025
12c739a
WIP: fixed if there is no quadratic term in decorator template objective
jd-nm26 Apr 19, 2025
c14f909
feat: quadratic and linear terms for objectives and constraints with …
jd-nm26 Apr 19, 2025
689f4e4
WIP: seem to be able to templatize a single linear constraint that is…
jd-nm26 Apr 23, 2025
955015b
WIP: minor change to logger entry to print Q matrix when it is None
jd-nm26 Apr 23, 2025
ac57b01
WIP: cleaning up diagnostic logs and classes
jd-nm26 Apr 23, 2025
70a2d14
cleanup
jd-nm26 Apr 23, 2025
c88313d
cleaned up old logger.info call; added optional DEBUG_LP_FILE to guro…
jd-nm26 May 7, 2025
0327980
WIP: adding solver tests for quadratic templates with gurobi_direct s…
jd-nm26 May 8, 2025
5630bd4
WIP: added baseline test to ensure linear still works
jd-nm26 May 8, 2025
34d8480
added remaining quadratic template gurobi direct tests
jd-nm26 May 12, 2025
1887e8c
reformatted changed files
jd-nm26 May 12, 2025
4ce1366
re-enabled failing test_quadratic_constraint_binomial_expansion_decor…
jd-nm26 May 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
32 changes: 19 additions & 13 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
codecov:
notify:
# GHA: 5, Jenkins: 11
# Accurate as of April 1, 2025
# Potential to change when Python versions change. We will allow
# codecov to start reporting when 80% of the reports are in. This
# will hopefully help avoid an issue where codecov is not tracking
# PR branches (see https://github.com/codecov/feedback/issues/692).
after_n_builds: 13
wait_for_ci: false
require_ci_to_pass: false
comment:
after_n_builds: 13
coverage:
range: "50...100"
range: 70..98
status:
patch:
default:
# Force patches to be covered at the level of the codebase
threshold: 0.0
project:
default:
# Allow overall coverage to drop to avoid failures due to code
# cleanup or CI unavailability/lag
threshold: 5%
patch:
default:
# Force patches to be covered at the level of the codebase
threshold: 0%
# ci:
# - !ci.appveyor.com
codecov:
notify:
# GHA: 4, Jenkins: 8
after_n_builds: 12 # all
wait_for_ci: yes
threshold: 5.0
6 changes: 3 additions & 3 deletions .coin-or/projDesc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ Carl D. Laird, Chair, Pyomo Management Committee, claird at andrew dot cmu dot e
Use explicit overrides to disable use of automated
version reporting.
-->
<stableVersionNumber>6.7.0</stableVersionNumber>
<releaseNumber>6.7.0</releaseNumber>
<stableVersionNumber>6.9.2</stableVersionNumber>
<releaseNumber>6.9.2</releaseNumber>

</developmentStatus>

Expand Down Expand Up @@ -287,7 +287,7 @@ Carl D. Laird, Chair, Pyomo Management Committee, claird at andrew dot cmu dot e

<platform>
<operatingSystem>Any</operatingSystem>
<compiler>Python 3.8, 3.9, 3.10, 3.11, 3.12</compiler>
<compiler>Python 3.9, 3.10, 3.11, 3.12, 3.13</compiler>
</platform>

</testedPlatforms>
Expand Down
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,5 @@ ed13c8c65d6c3f56973887744be1c62a5d4756de
363a16a609f519b3edfdfcf40c66d6de7ac135af
d024718991455519e09149ede53a38df1c067abe
017e21ee50d98d8b2f2083e6880f030025ed5378
91972008d109322fc1a3b688333d67def2288625

2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ about: Report a bug in Pyomo (command not working as expected, etc.)
labels: "bug"
---

<!-- DO NOT DELETE OR IGNORE THIS TEMPLATE. Failing to adhere to this template and provide the necessary information may lead to your Issue being closed without consideration. -->

## Summary

<!-- Explain, in a clear and concise way, the command you ran and the result you were trying to achieve.
Expand Down
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ labels: enhancement

---

<!-- DO NOT DELETE OR IGNORE THIS TEMPLATE. Failing to adhere to this template and provide the necessary information may lead to your Issue being closed without consideration. -->

<!-- BEFORE SUBMITTING AN ENHANCEMENT REQUEST - please browse the open issues and the [Archived Design Discussions wiki page](https://github.com/Pyomo/pyomo/wiki/Archived-Design-Discussions).-->

## Summary
Expand Down
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<!-- Contributing Guide: https://pyomo.readthedocs.io/en/stable/contribution_guide.html -->
<!-- ##################################################################### -->

<!-- DO NOT DELETE OR IGNORE THIS TEMPLATE. Failing to adhere to this template and provide the necessary information may lead to your Pull Request being closed without consideration. -->

## Fixes # .

## Summary/Motivation:
Expand Down
107 changes: 86 additions & 21 deletions .github/workflows/release_wheel_creation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
push:
tags:
- '*'
schedule:
- cron: '0 0 3 * *'
workflow_dispatch:
inputs:
git-ref:
Expand All @@ -14,8 +16,9 @@ concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
PYOMO_SETUP_ARGS: "--with-cython --with-distributable-extensions"
defaults:
run:
shell: bash -l {0}

jobs:
native_wheels:
Expand All @@ -24,36 +27,59 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ubuntu-22.04, windows-latest, macos-latest]
os: [ubuntu-latest, windows-latest, macos-latest]
arch: [all]
wheel-version: ['cp38*', 'cp39*', 'cp310*', 'cp311*', 'cp312*']
wheel-version: ['cp39*', 'cp310*', 'cp311*', 'cp312*', 'cp313*']

include:
- wheel-version: 'cp38*'
TARGET: 'py38'
- wheel-version: 'cp39*'
TARGET: 'py39'
GLOBAL_OPTIONS: "--with-cython --with-distributable-extensions"
- wheel-version: 'cp310*'
TARGET: 'py310'
GLOBAL_OPTIONS: "--with-cython --with-distributable-extensions"
- wheel-version: 'cp311*'
TARGET: 'py311'
GLOBAL_OPTIONS: "--without-cython --with-distributable-extensions"
- wheel-version: 'cp312*'
TARGET: 'py312'
GLOBAL_OPTIONS: "--without-cython --with-distributable-extensions"
- wheel-version: 'cp313*'
TARGET: 'py313'
GLOBAL_OPTIONS: "--without-cython --with-distributable-extensions"

# We use pure python for any Windows/python greater than 3.10
exclude:
- wheel-version: 'cp311*'
os: windows-latest
- wheel-version: 'cp312*'
os: windows-latest
- wheel-version: 'cp313*'
os: windows-latest

steps:
- uses: actions/checkout@v4
- name: Create pyproject.toml
run: |
# Per the cibuildwheel documentation, you can technically use
# CIBW_BEFORE_BUILD to do these steps; however, as of the newest
# version (2.21.3) this feature does not work. This is a hack
# to make cibuildwheel recognize our pre-build requirements
echo -e '[build-system]\n\nrequires = [ "setuptools", "wheel", "cython", "pybind11" ]' > $GITHUB_WORKSPACE/pyproject.toml
cat $GITHUB_WORKSPACE/pyproject.toml
ls -la $GITHUB_WORKSPACE
- name: Build wheels
uses: pypa/cibuildwheel@v2.16.5
uses: pypa/cibuildwheel@v2.21.3
with:
output-dir: dist
env:
CIBW_ARCHS_LINUX: "native"
CIBW_ARCHS_MACOS: "native arm64"
CIBW_ARCHS_WINDOWS: "native ARM64"
CIBW_SKIP: "*-musllinux*"
CIBW_ARCHS_MACOS: "x86_64 arm64"
CIBW_ARCHS_WINDOWS: "AMD64 ARM64"
CIBW_BUILD: ${{ matrix.wheel-version }}
CIBW_SKIP: "*-musllinux*"
CIBW_BUILD_VERBOSITY: 1
CIBW_BEFORE_BUILD: pip install cython pybind11
CIBW_CONFIG_SETTINGS: '--global-option="--with-cython --with-distributable-extensions"'
CIBW_ENVIRONMENT: PYOMO_SETUP_ARGS="${{ matrix.GLOBAL_OPTIONS }}"
- uses: actions/upload-artifact@v4
with:
name: native_wheels-${{ matrix.os }}-${{ matrix.TARGET }}
Expand All @@ -65,45 +91,84 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04]
os: [ubuntu-latest]
arch: [all]
wheel-version: ['cp38*', 'cp39*', 'cp310*', 'cp311*', 'cp312*']
wheel-version: ['cp39*', 'cp310*', 'cp311*', 'cp312*', 'cp313*']

include:
- wheel-version: 'cp38*'
TARGET: 'py38'
- wheel-version: 'cp39*'
TARGET: 'py39'
GLOBAL_OPTIONS: "--with-cython --with-distributable-extensions"
- wheel-version: 'cp310*'
TARGET: 'py310'
GLOBAL_OPTIONS: "--with-cython --with-distributable-extensions"
- wheel-version: 'cp311*'
TARGET: 'py311'
GLOBAL_OPTIONS: "--without-cython --with-distributable-extensions"
- wheel-version: 'cp312*'
TARGET: 'py312'
GLOBAL_OPTIONS: "--without-cython --with-distributable-extensions"
- wheel-version: 'cp313*'
TARGET: 'py313'
GLOBAL_OPTIONS: "--without-cython --with-distributable-extensions"
steps:
- uses: actions/checkout@v4
- name: Set up QEMU
if: runner.os == 'Linux'
uses: docker/setup-qemu-action@v3
with:
platforms: all
- name: Create pyproject.toml
run: |
# Per the cibuildwheel documentation, you can technically use
# CIBW_BEFORE_BUILD to do these steps; however, as of the newest
# version (2.21.3) this feature does not work. This is a hack
# to make cibuildwheel recognize our pre-build requirements
echo -e '[build-system]\n\nrequires = [ "setuptools", "wheel", "cython", "pybind11" ]' > $GITHUB_WORKSPACE/pyproject.toml
cat $GITHUB_WORKSPACE/pyproject.toml
ls -la $GITHUB_WORKSPACE
- name: Build wheels
uses: pypa/cibuildwheel@v2.16.5
uses: pypa/cibuildwheel@v2.21.3
with:
output-dir: dist
env:
CIBW_ARCHS_LINUX: "aarch64"
CIBW_SKIP: "*-musllinux*"
CIBW_BUILD: ${{ matrix.wheel-version }}
CIBW_SKIP: "*-musllinux*"
CIBW_BUILD_VERBOSITY: 1
CIBW_BEFORE_BUILD: pip install cython pybind11
CIBW_CONFIG_SETTINGS: '--global-option="--with-cython --with-distributable-extensions"'
CIBW_ENVIRONMENT: PYOMO_SETUP_ARGS="${{ matrix.GLOBAL_OPTIONS }}"
- uses: actions/upload-artifact@v4
with:
name: alt_wheels-${{ matrix.os }}-${{ matrix.TARGET }}
path: dist/*.whl
overwrite: true

pure_python:
name: pure_python_wheel
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.11']
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install twine wheel setuptools pybind11
- name: Build pure python wheel
run: |
python setup.py --without-cython sdist --format=gztar bdist_wheel
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: purepythonwheel
path: dist/*.whl
overwrite: true

generictarball:
name: ${{ matrix.TARGET }}
runs-on: ${{ matrix.os }}
Expand All @@ -114,7 +179,7 @@ jobs:
include:
- os: ubuntu-latest
TARGET: generic_tarball
python-version: [3.8]
python-version: [3.9]
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand Down
Loading