Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3875 commits
Select commit Hold shift + click to select a range
c7bf0d6
Merge branch 'main' into pyros-confidence-ellipsoid
shermanjasonaf Nov 26, 2024
d3f0bf5
Merge pull request #3433 from jsiirola/neos-test-solvers
mrmundt Nov 26, 2024
e0cc3ff
Merge branch 'main' into dsda_dev
mrmundt Nov 26, 2024
15e37d6
Remove Python 3.8 Support
mrmundt Nov 26, 2024
0b11c54
Correct pyomo version number in logging example
shermanjasonaf Nov 27, 2024
e0fe369
Merge branch 'main' into pyros-confidence-ellipsoid
shermanjasonaf Nov 27, 2024
31ae3ff
Extend `InputDataStandardizer` to allow multiple component types
shermanjasonaf Nov 30, 2024
7df8dec
Allow PyROS to accept `Var`s as uncertain params
shermanjasonaf Nov 30, 2024
24f0c99
Test uncertain param substitution in working model startup
shermanjasonaf Nov 30, 2024
40a134b
Apply black
shermanjasonaf Nov 30, 2024
2b9bd29
Remove unused import
shermanjasonaf Nov 30, 2024
90e4e15
Account for `Var`-type uncertain params in preprocessor tests
shermanjasonaf Nov 30, 2024
3d7b8f0
Maintain named expressions in `Param` for `Var` substitutions
shermanjasonaf Nov 30, 2024
972ae6c
Modify uncertain parameter replacement logging messages
shermanjasonaf Nov 30, 2024
c7cf91a
Note Var bounds/domains/fixing ignored in PyROS docstring
shermanjasonaf Nov 30, 2024
05dfbb6
Modify test for `InputDataStandardizer.domain_name()`
shermanjasonaf Nov 30, 2024
13e6ac5
Apply black
shermanjasonaf Nov 30, 2024
24d49c1
Merge branch 'main' into pyros-vars-as-params
shermanjasonaf Nov 30, 2024
3b4c59d
Tweak documentation of PyROS `uncertain_params` argument
shermanjasonaf Dec 1, 2024
ec086dd
Make some coeff matching tests more rigorous
shermanjasonaf Dec 1, 2024
d9588f1
Apply black
shermanjasonaf Dec 1, 2024
2243d2e
Tweak new var as uncertain param test
shermanjasonaf Dec 1, 2024
eb8a6b5
Merge pull request #3438 from mrmundt/remove-3.8
jsiirola Dec 2, 2024
ff03fe0
Merge branch 'main' into identify-vars
jsiirola Dec 2, 2024
f000120
Merge branch 'main' into pyros-confidence-ellipsoid
shermanjasonaf Dec 2, 2024
35e6487
Modify uncertain parameter refs in online docs
shermanjasonaf Dec 2, 2024
88d48c6
Merge branch 'main' into pyros-vars-as-params
shermanjasonaf Dec 2, 2024
3db32c9
Merge branch 'pyros-vars-as-params' of github.com:shermanjasonaf/pyom…
shermanjasonaf Dec 2, 2024
c372d98
Tweak note on vars as params
shermanjasonaf Dec 2, 2024
ec2478e
Simplify `EllipsoidalSet` constructor docstring
shermanjasonaf Dec 3, 2024
e389bfd
Merge branch 'pyros-confidence-ellipsoid' of github.com:shermanjasona…
shermanjasonaf Dec 3, 2024
08970d8
added efficiency for handling SP subsolver errors
jas-yao Dec 3, 2024
77e88f2
added unit tests for subsolver error efficiency
jas-yao Dec 3, 2024
76edd51
Merge branch 'Pyomo:main' into pyros-sp-efficiency
jas-yao Dec 3, 2024
0038ffc
added and updated comments
jas-yao Dec 3, 2024
4228967
Add support for "imp"-style finders in the DeferredImportCallbackFinder
jsiirola Dec 5, 2024
e7d52a3
Add testing for the DeferredImportCallbackFinder
jsiirola Dec 5, 2024
565a3f1
Remove interaction among tests
jsiirola Dec 5, 2024
2510d06
NFC: apply black
jsiirola Dec 5, 2024
6f36384
Merge pull request #3444 from jsiirola/imp-finder-compat
jsiirola Dec 6, 2024
ac92c1e
NFC: fix doc typo
jsiirola Dec 10, 2024
201aed4
apply black format
ZedongPeng Dec 10, 2024
94e9732
add additional logging information
jas-yao Dec 16, 2024
afef8bf
Add wrapper to propagate flush through StremHandle pipes
jsiirola Dec 18, 2024
0bd150e
Support passing TeeStream to capture_output
jsiirola Dec 18, 2024
d922342
TeeStream: duplicate target file descriptors to avoid conflicts with …
jsiirola Dec 18, 2024
1a4512f
TeeStream: suppirtsetting buffering in internal out/err streams
jsiirola Dec 18, 2024
733cd75
capture_output: prevent duplicate output redirection
jsiirola Dec 18, 2024
e68ffe3
NFC: apply black
jsiirola Dec 18, 2024
dbe3c25
Add tests for buffering in TeeStream/capture_output
jsiirola Dec 18, 2024
be90f1a
Standardize use of TeeStream / capture_output
jsiirola Dec 18, 2024
24ec6bc
Do not start the SAS session until needed (for .available or .solve)
jsiirola Dec 18, 2024
83767d3
Merge pull request #3434 from shermanjasonaf/pyros-confidence-ellipsoid
mrmundt Dec 18, 2024
a68ccf2
Merge branch 'main' into pyros-sp-efficiency
mrmundt Dec 18, 2024
d265469
Merge branch 'main' into pyros-vars-as-params
shermanjasonaf Dec 20, 2024
21e28a1
Update version number, changelog
shermanjasonaf Dec 20, 2024
1bde454
Add bullet on DEBUG-level output logs
shermanjasonaf Dec 20, 2024
2c05c09
update discrete scenario debug logging
jas-yao Dec 20, 2024
1f59903
added skipUnless solver available for unit tests
jas-yao Dec 20, 2024
3c627f3
lengthen long message to trigger flush on osx
jsiirola Jan 10, 2025
b54a396
New Year, New Typos
mrmundt Jan 10, 2025
9ed1bdb
Apply black
mrmundt Jan 10, 2025
14f21e6
Change ubuntu-latest to ubuntu-22.04
mrmundt Jan 10, 2025
6a0be49
Update ubuntu; update headless action
mrmundt Jan 10, 2025
76c59d3
Fix broken URLs
mrmundt Jan 13, 2025
a625df6
Upgrade to pypy-3.10
mrmundt Jan 13, 2025
2a50773
Introduce PATH forcing
mrmundt Jan 13, 2025
c861491
Fix PyNumero tests to use TempfileManager
mrmundt Jan 13, 2025
3722b42
Apply black
mrmundt Jan 13, 2025
dcb6102
Make sensitivity docs more robust to small solver differences
jsiirola Jan 14, 2025
33a3e96
Avoid setting _default to NOTSET when duplicating ConfigValue objects
jsiirola Jan 14, 2025
ff045f8
Fix typo
jsiirola Jan 14, 2025
6db771e
Map an additional -0.000 -> 0.000
jsiirola Jan 14, 2025
7d67333
Grammar typo
mrmundt Jan 14, 2025
b2cb3ae
Merge pull request #3453 from mrmundt/new-typos
mrmundt Jan 14, 2025
dcd9500
Merge branch 'main' into sas-available
mrmundt Jan 14, 2025
c5c117e
Merge branch 'main' into tee-stream-fixes
mrmundt Jan 14, 2025
57ed57c
Merge branch 'main' into pyros-vars-as-params
blnicho Jan 14, 2025
e2a3345
Merge branch 'main' into dsda_dev
emma58 Jan 15, 2025
6421117
add gams license check for test_ldsda.py
ZedongPeng Jan 15, 2025
15f9d81
Skip XPRESS 9.5.1 on conda/windows/python 3.1[01] due to init() hang
jsiirola Jan 15, 2025
b2064b2
Rearrange some python versions, remove unnecessary quotation
jsiirola Jan 15, 2025
72b91b5
Remove unnecessary highspy version specifier (the default release is …
jsiirola Jan 15, 2025
2be3bcc
Synchronize build workflows
jsiirola Jan 15, 2025
00d6a77
conda doesn't support !=
jsiirola Jan 15, 2025
202951a
Update xpress version spec
jsiirola Jan 16, 2025
3f81bbe
Add some log formatting
jsiirola Jan 16, 2025
deac465
Alternate approach for specifying xpress version
jsiirola Jan 16, 2025
f9b7b0d
Pin xpress in certain conditions
jsiirola Jan 16, 2025
e85ec04
Ensure one branches test covers python 3.9
jsiirola Jan 16, 2025
b0ab851
Merge pull request #3455 from jsiirola/xpress-9.5.1
mrmundt Jan 16, 2025
2b80f09
Merge branch 'main' into tee-stream-fixes
mrmundt Jan 16, 2025
83354b1
split apart buffering tests
jsiirola Jan 16, 2025
b5d9c24
Merge branch 'main' into sas-available
jsiirola Jan 16, 2025
53e40c4
NFC: update badge URL in README
jsiirola Jan 16, 2025
18c4cbd
Remove redundant badge
jsiirola Jan 16, 2025
c911ea3
Restrict badge to only include push (PR merge) events
jsiirola Jan 16, 2025
8c2e601
Merge pull request #3457 from jsiirola/readme-badges
jsiirola Jan 17, 2025
1521928
Merge branch 'main' into pyros-vars-as-params
shermanjasonaf Jan 18, 2025
c3fc428
Require that `Vars` passed as uncertain params be fixed
shermanjasonaf Jan 20, 2025
04eb8aa
Apply black
shermanjasonaf Jan 20, 2025
df3ee82
Complete black reformatting
shermanjasonaf Jan 20, 2025
d2b98c1
More rigorously test uncertain param data validator
shermanjasonaf Jan 20, 2025
e55d0c5
Add note on uncertain params fixed to other uncertain params
shermanjasonaf Jan 20, 2025
7663111
Make PyROS uncertain params as vars tests more rigorous
shermanjasonaf Jan 20, 2025
af16736
Apply black
shermanjasonaf Jan 20, 2025
f85f103
Adjust PyROS online doc to new uncertain parameter restriction
shermanjasonaf Jan 20, 2025
17233f7
Tweak doc note on support for `Var`s as uncertain parameters
shermanjasonaf Jan 20, 2025
bd3e444
Merge pull request #3448 from jsiirola/sas-available
blnicho Jan 21, 2025
d841bdb
Merge branch 'main' into dsda_dev
blnicho Jan 21, 2025
5ef19dd
Big Wheel of Misfortune - A Practice in Reviewing Old Issues
mrmundt Jan 21, 2025
fb33f7c
More logical to move num_issues declaration up
mrmundt Jan 21, 2025
f15a243
Fix and unit test separation problem initialization routine
shermanjasonaf Jan 22, 2025
0dcc534
Make new separation problem initialization tests more comprehensive
shermanjasonaf Jan 22, 2025
0fecfef
Fix and test PyROS input model variable scope ascertainment
shermanjasonaf Jan 23, 2025
e8baa97
Merge branch 'Pyomo:main' into address-fixed-var-sep-init-typos
shermanjasonaf Jan 23, 2025
5e893da
Apply black
shermanjasonaf Jan 23, 2025
14d778b
Test PyROS solver response to fixed variable treatment
shermanjasonaf Jan 23, 2025
6068b20
Apply black
shermanjasonaf Jan 23, 2025
d5b33e5
Preemptively flush output to (hopefully) improve test isolation/deter…
jsiirola Jan 24, 2025
7733b44
Centralize test setup
jsiirola Jan 24, 2025
1f8d4d3
Retry buffering tests before reporting test failures
jsiirola Jan 27, 2025
39734a6
Increase the delay when re-trying the test
jsiirola Jan 28, 2025
aa652ca
Merge pull request #3460 from mrmundt/bwom
blnicho Jan 28, 2025
89f6d62
Rework flush in TeeStream to flush both local and user streams
jsiirola Jan 28, 2025
44ab23f
NFC: fix typo
jsiirola Jan 28, 2025
88345c3
Test MergedReader with and without flush
jsiirola Jan 28, 2025
9b72544
Remove retries in buffered writer tests
jsiirola Jan 28, 2025
608e766
Ensure flush is processed even when no data is read
jsiirola Jan 29, 2025
0e82163
NFC: apply black
jsiirola Jan 29, 2025
f6bcd15
Uppdate Qt tests to avoid core dump without active X11 session
jsiirola Jan 29, 2025
4f28012
NFC: Updates for Black 25.1.0
jsiirola Jan 29, 2025
db6655d
NFC: Updates for Black 25.1.0
jsiirola Jan 29, 2025
e3fef4a
NFC: fix typo
jsiirola Jan 29, 2025
6c9503b
NFC: remove empty docstring
jsiirola Jan 29, 2025
3a0cf09
NFC: fix typo
jsiirola Jan 29, 2025
095a6ed
Merge pull request #3463 from jsiirola/qt-test-fix
blnicho Jan 30, 2025
198f153
Merge branch 'main' into pyros-vars-as-params
blnicho Jan 30, 2025
81eb6db
Merge branch 'main' into tee-stream-fixes
jsiirola Jan 30, 2025
d00f33f
Support multiple baselines for buffering tests
jsiirola Jan 30, 2025
89ca384
Simplify component type check
shermanjasonaf Jan 30, 2025
fcfd56c
Correct argument data type documentation
shermanjasonaf Jan 30, 2025
8bbb7ac
Correct PyROS `ConfigDict` description of argument `uncertain_params`
shermanjasonaf Jan 30, 2025
04663a4
Merge branch 'pyros-vars-as-params' of github.com:shermanjasonaf/pyom…
shermanjasonaf Jan 30, 2025
9688c3f
Tweak uncertain parameter substitution logging message
shermanjasonaf Jan 30, 2025
9ce4903
bugfix: output message when test fails
jsiirola Jan 30, 2025
b9aee5b
Merge branch 'main' into identify-vars
jsiirola Jan 30, 2025
ea4fc58
Merge branch 'main' into identify-vars
jsiirola Jan 30, 2025
a3aa203
Use dict not list to store nested named expressions
jsiirola Jan 31, 2025
f592eae
Improve efficiency of identify_vars data structures
jsiirola Jan 31, 2025
926d96a
allow construction of CUID from another CUID
Robbybp Feb 2, 2025
4640f64
dont need to check for cuid in find_component
Robbybp Feb 2, 2025
e696783
dont need to check for cuid in get_indexed_cuid
Robbybp Feb 2, 2025
ae4e0d1
error when CUID and context are provided
Robbybp Feb 2, 2025
2357c03
black
Robbybp Feb 2, 2025
c23320f
address review
Robbybp Feb 4, 2025
5926510
fix syntax error
Robbybp Feb 4, 2025
682ebbf
function in module scope
Robbybp Feb 4, 2025
2cddb8a
Merge remote-tracking branch 'refs/remotes/me/identify-vars' into ide…
jsiirola Feb 4, 2025
38ff353
Do not fail stdout flush tests under pypy
jsiirola Feb 4, 2025
8a50553
Merge pull request #3449 from jsiirola/tee-stream-fixes
mrmundt Feb 4, 2025
d75bc92
Update example to match documentation text
jsiirola Feb 4, 2025
2e85c53
NFC: fix typo
jsiirola Feb 4, 2025
258a112
NFC: apply black
jsiirola Feb 4, 2025
ad4ceb8
Add note on assumption for uncertain parameter evaluation
shermanjasonaf Feb 4, 2025
148b98a
Speed up uncertain parameter substitution method
shermanjasonaf Feb 4, 2025
daca6d0
Test substituting named expressions in constraints
shermanjasonaf Feb 4, 2025
2bc2801
Merge branch 'main' into pyros-vars-as-params
shermanjasonaf Feb 4, 2025
43be3e5
Merge branch 'pyros-vars-as-params' of github.com:shermanjasonaf/pyom…
shermanjasonaf Feb 4, 2025
7dec651
Clarify note on assumption about unfixed Vars
shermanjasonaf Feb 4, 2025
61e28af
Merge pull request #3439 from shermanjasonaf/pyros-vars-as-params
blnicho Feb 5, 2025
db9c375
Merge branch 'main' into identify-vars
blnicho Feb 5, 2025
b69a3e0
Merge branch 'main' into pyros-sp-efficiency
blnicho Feb 5, 2025
df5aa60
Remove the special handling for pypy; add a retry
jsiirola Feb 5, 2025
98fbb97
Restoore test skip under pypy
jsiirola Feb 5, 2025
83eb7d7
Merge branch 'main' into buffer-test-retry
jsiirola Feb 5, 2025
cd778c5
Merge pull request #3465 from jsiirola/buffer-test-retry
blnicho Feb 5, 2025
ddbe61f
Merge branch 'main' into cuid-from-cuid
blnicho Feb 5, 2025
8d1fff7
Merge branch 'main' into identify-vars
mrmundt Feb 5, 2025
1ff18fe
Improve logic for when to close intermediate file handles
jsiirola Feb 5, 2025
f3bb89e
Clarify intent of preemptive filehandle flush
jsiirola Feb 5, 2025
707637a
Merge branch 'main' into pyros-sp-efficiency
jas-yao Feb 5, 2025
95fa211
Merge pull request #3436 from jsiirola/identify-vars
mrmundt Feb 5, 2025
5eda240
Merge branch 'main' into osx-closed-filehandle
mrmundt Feb 5, 2025
272ba63
Merge pull request #3464 from Robbybp/cuid-from-cuid
blnicho Feb 6, 2025
45b5a46
Update version number and changelog
jas-yao Feb 6, 2025
e5d2c78
Merge pull request #3467 from jsiirola/osx-closed-filehandle
blnicho Feb 6, 2025
e7389a8
Add support for AMPL Gurobi interface for Gurobi 12+
jsiirola Feb 10, 2025
c35eee8
NFC: update comments, apply black
jsiirola Feb 10, 2025
8ba0dfb
NFC: fix typo
jsiirola Feb 10, 2025
f14f30a
Merge branch 'main' into pyros-sp-efficiency
blnicho Feb 10, 2025
dd69a9c
NFC: Fix docstring typo in pyomo/contrib/pyros/solve_data.py
blnicho Feb 10, 2025
ce3100e
resolve the test failure
ZedongPeng Feb 11, 2025
a0b2396
add exception_flag=False
ZedongPeng Feb 11, 2025
1839c37
apply black format
ZedongPeng Feb 11, 2025
53626a6
Merge branch 'main' into dsda_dev
ZedongPeng Feb 11, 2025
590dcae
Resolve error parenthesizing pow mantissa
jsiirola Feb 11, 2025
975fbd7
Add comment explaining embedded constant
jsiirola Feb 11, 2025
0f0b82b
Merge branch 'main' of github.com:Pyomo/pyomo into bwom
mrmundt Feb 11, 2025
c57ea76
BWOM Bug Fix: Do Not Show PRs
mrmundt Feb 11, 2025
189d014
Resolve precedence logic bugs in CP expressions
jsiirola Feb 12, 2025
04bd416
Merge pull request #3470 from jsiirola/gurobi-12-nl
jsiirola Feb 12, 2025
83c4a28
Merge branch 'main' into dsda_dev
ZedongPeng Feb 12, 2025
e43c075
Merge pull request #3473 from mrmundt/bwom
mrmundt Feb 12, 2025
e316806
Merge pull request #3441 from jas-yao/pyros-sp-efficiency
blnicho Feb 12, 2025
98b420d
Merge branch 'main' into address-fixed-var-sep-init-typos
blnicho Feb 12, 2025
c65c8a7
Update version number, changelog
shermanjasonaf Feb 12, 2025
9eb9709
Update retrieval of utc time due to deprecation warning
shermanjasonaf Feb 12, 2025
f64a673
Apply black to reformat subprocess call
shermanjasonaf Feb 12, 2025
9dc15e7
Add more information to deterministic master subsolver error message
shermanjasonaf Feb 12, 2025
3452dbc
Simplify PyROS methodology documentation note
shermanjasonaf Feb 12, 2025
91421bb
Tweak enumeration item casing
shermanjasonaf Feb 12, 2025
b5c98c6
Update version number in logging output example
shermanjasonaf Feb 12, 2025
0de01ba
Merge branch 'address-fixed-var-sep-init-typos' into fix-docs-and-log…
shermanjasonaf Feb 12, 2025
99d0d1c
Update solver logging output example
shermanjasonaf Feb 12, 2025
85c0035
Merge pull request #3472 from jsiirola/pow-pprint
blnicho Feb 12, 2025
0f12ced
Merge branch 'main' into dsda_dev
bernalde Feb 12, 2025
a3c90c2
Merge pull request #3461 from shermanjasonaf/address-fixed-var-sep-in…
blnicho Feb 13, 2025
2ff4388
Merge branch 'main' into dsda_dev
blnicho Feb 13, 2025
cd2289f
New typo corrections - Feb 2025
blnicho Feb 13, 2025
9815227
Test suppression of git error message in PyROS logging
shermanjasonaf Feb 13, 2025
14be2e1
Update version number, changelog
shermanjasonaf Feb 13, 2025
fc00ebf
Merge branch 'main' into fix-docs-and-logging
shermanjasonaf Feb 13, 2025
bb5f993
Merge pull request #3474 from blnicho/new-typos
blnicho Feb 13, 2025
40e8a46
Merge branch 'main' into dsda_dev
blnicho Feb 13, 2025
0f955d0
Merge branch 'main' into fix-docs-and-logging
blnicho Feb 13, 2025
cc2185b
Merge pull request #3475 from shermanjasonaf/fix-docs-and-logging
jsiirola Feb 15, 2025
49309c2
add pyomo copyright statement
ZedongPeng Feb 18, 2025
c640e70
Add pyomo copyright statement
ZedongPeng Feb 18, 2025
d88795e
Update copyright year range
ZedongPeng Feb 18, 2025
ff0204a
Update pyomo/contrib/gdpopt/ldsda.py
ZedongPeng Feb 18, 2025
fac886b
Update pyomo/contrib/gdpopt/ldsda.py
ZedongPeng Feb 18, 2025
9ed860e
fix typo
ZedongPeng Feb 18, 2025
17496ca
resolve todo
ZedongPeng Feb 18, 2025
cfbcc8f
Merge branch 'main' into dsda_dev
ZedongPeng Feb 18, 2025
48c0644
resolve simple comments
ZedongPeng Feb 18, 2025
0fb96a7
improve docstring
ZedongPeng Feb 18, 2025
c461a99
Update pyomo/contrib/gdpopt/ldsda.py
ZedongPeng Feb 18, 2025
febb7a9
remove redundant direction_norm check
ZedongPeng Feb 18, 2025
e29fe64
fix bug
ZedongPeng Feb 19, 2025
5d55cca
Pin Sphinx to not 8.2.0
mrmundt Feb 19, 2025
a16aa01
Merge pull request #3479 from mrmundt/pin-sphinx
mrmundt Feb 19, 2025
2cae8da
change config.disjunction_list and config.logical_constraint_list to …
ZedongPeng Feb 19, 2025
51f0e21
Merge branch 'main' into dsda_dev
mrmundt Feb 19, 2025
a4f86ed
fix typos
ZedongPeng Feb 19, 2025
8bde243
BUGFIX: f-string in contrib/solver
mrmundt Feb 19, 2025
5f522f3
Merge pull request #3481 from mrmundt/solver-bugfix
mrmundt Feb 19, 2025
0d56aff
remove try except
ZedongPeng Feb 19, 2025
6a5b3d8
Merge branch 'main' into dsda_dev
ZedongPeng Feb 19, 2025
ea99c90
add domain for logical_constraint_list and disjunction_list
ZedongPeng Feb 19, 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
  •  
  •  
  •  
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.8.2</stableVersionNumber>
<releaseNumber>6.8.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
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
131 changes: 112 additions & 19 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,68 +16,158 @@ 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:
name: Build wheels (${{ matrix.wheel-version }}) on ${{ matrix.os }} for native and cross-compiled architecture
runs-on: ${{ matrix.os }}
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: '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.2
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
name: native_wheels-${{ matrix.os }}-${{ matrix.TARGET }}
path: dist/*.whl
overwrite: true

alternative_wheels:
name: Build wheels (${{ matrix.wheel-version }}) on ${{ matrix.os }} for aarch64
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: '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.2
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
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 }}
Expand All @@ -87,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 All @@ -106,4 +198,5 @@ jobs:
with:
name: generictarball
path: dist
overwrite: true

Loading
Loading