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

Mindtpy rewrite #26

Open
wants to merge 3,470 commits into
base: main_copy
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3470 commits
Select commit Hold shift + click to select a range
2710207
clean up imports in implicit_functions.py
Robbybp Jun 30, 2023
84c1a2a
trailing comma in import
Robbybp Jun 30, 2023
688668b
remove more unusd imports
Robbybp Jun 30, 2023
bd52500
Merge pull request #2892 from Robbybp/implicit-function-imports
blnicho Jun 30, 2023
cb9f6fe
Add module import tester
jsiirola Jul 3, 2023
5135ed1
Add mpi4py to common.dependencies
jsiirola Jul 3, 2023
e8bea05
Use attemot_import when importing cplex
jsiirola Jul 3, 2023
4799e05
Update / standardize Qt imports
jsiirola Jul 3, 2023
91a7b0a
Correct declaration of raw strings
jsiirola Jul 3, 2023
d713b68
Leverage attempt_import when importing spreadsheet interface from pyu…
jsiirola Jul 3, 2023
9681492
Remove use of deprecated importlib API
jsiirola Jul 3, 2023
06c6784
Resolve error deallocating Mumps interface when mumps is not available
jsiirola Jul 3, 2023
fa3aca8
Track move of pyomo.core.util module
jsiirola Jul 3, 2023
6313f2c
Avoid deprecation warning by importing sputils from new (private) loc…
jsiirola Jul 3, 2023
7447776
Fix for example that uses the simple_constraint_rule decorator as a f…
jsiirola Jul 3, 2023
5a48548
Update fix_disjuncts so that it can be imported without pyomo.environ
jsiirola Jul 3, 2023
1179e95
Update tester.py so that it is importable; TODO: remove this file
jsiirola Jul 3, 2023
ecdd68f
Add importtest to the singletest job; reorganize jobs to reduce diffs
jsiirola Jul 4, 2023
87e2ae2
NFC: commenting diff between workflows
jsiirola Jul 4, 2023
7237865
Fix syntax error
jsiirola Jul 4, 2023
2639166
Fix syntax error
jsiirola Jul 4, 2023
2fedc3b
Apply black
jsiirola Jul 4, 2023
ff70d4f
fix deprecation warnings in pynumero
michaelbynum Jul 4, 2023
436d391
Merge branch 'main' into empty_blocks
michaelbynum Jul 4, 2023
46ce6ca
test mpi block vector with blocks of size 0
michaelbynum Jul 4, 2023
3a3fb8a
test mpi block vector with blocks of size 0
michaelbynum Jul 4, 2023
04542e6
test mpi block vector with blocks of size 0
michaelbynum Jul 4, 2023
241d21a
Reversing quotation characters
jsiirola Jul 5, 2023
0daf335
Avoid intermediate bash variable
jsiirola Jul 5, 2023
31919e4
Avoid exception when cplexamp is not available
jsiirola Jul 5, 2023
f15cc90
Development script should be importable
jsiirola Jul 5, 2023
5240d2f
Merge pull request #2895 from michaelbynum/pynumero_deprecations
jsiirola Jul 5, 2023
f87d22a
Revert "Avoid deprecation warning by importing sputils from new (priv…
jsiirola Jul 5, 2023
c0dfa01
Merge branch 'main' into import-tester
jsiirola Jul 5, 2023
7bc3313
simplify and improve processing of objective bounds from Gurobi
michaelbynum Jul 5, 2023
a7e28a3
tests for processing objective bounds from Gurobi for nonconvex QCPs
michaelbynum Jul 5, 2023
ba6ed70
run black
michaelbynum Jul 5, 2023
2110e81
fix mindtpy singletree implementation bug
ZedongPeng Jul 6, 2023
b6086bc
add description for mip_start_lazy_oa_cuts
ZedongPeng Jul 6, 2023
a0b4896
Merge pull request #2898 from michaelbynum/appsi_gurobi_results
michaelbynum Jul 6, 2023
2506ef3
add comments
ZedongPeng Jul 7, 2023
8271cb5
format
ZedongPeng Jul 7, 2023
1ce6571
add PyNumeroEvaluationError and use it in ASL interface instead of as…
Robbybp Jul 7, 2023
ec5c83b
add blank line for black
Robbybp Jul 7, 2023
72f1666
change default behavior in appsi to not care where variables live
michaelbynum Jul 10, 2023
f228b85
run black
michaelbynum Jul 10, 2023
a32149d
Move TemplateExpressionError to common.errros
jsiirola Jul 10, 2023
bcceb90
Move value(), check_if_numeric_type() to common.numeric_types
jsiirola Jul 10, 2023
374a1cd
Move NumericValue, NumericNDArray to expr.numeric_expr
jsiirola Jul 10, 2023
1d3bc93
Break import loop by deferring the visitor import
jsiirola Jul 10, 2023
b6cdf40
Silence (unnecessary) test output to console
jsiirola Jul 10, 2023
7577f47
Remove private classes/functions from expr.current
jsiirola Jul 10, 2023
769affe
Move numerif function defitions into expr.numeric_expr
jsiirola Jul 11, 2023
f40bf83
improve appsi tests and fix a bug
michaelbynum Jul 11, 2023
72f18f0
run black
michaelbynum Jul 11, 2023
bd90f61
Adding function for collecting all expressions with unit inconsistencies
Jul 11, 2023
811fe6c
change the name of feasibility pump
ZedongPeng Jul 12, 2023
044143f
remove unused import
ZedongPeng Jul 12, 2023
16d25ca
simplify process_objective function args
ZedongPeng Jul 12, 2023
ef93dca
add tests catching PyNumeroEvaluationError
Robbybp Jul 12, 2023
547b8ed
add exception_flag=False for solver.available()
ZedongPeng Jul 13, 2023
a1fa3ec
Define UnavailableClass to generate base classes that raise DeferredI…
jsiirola Jul 14, 2023
71eb30e
Improve error message when using unavailable class
jsiirola Jul 14, 2023
e57a7fe
Track removal of bool from native_numeric_types
jsiirola Jul 14, 2023
3a590e2
Update UnavailableClass to raise DeferredImportError on attribute access
jsiirola Jul 14, 2023
52c0cb6
NFC: fix typo
jsiirola Jul 14, 2023
cbaa645
Merge branch 'main' into import-tester
jsiirola Jul 14, 2023
c1bb342
Move expression imports from expr.current to core.expr
jsiirola Jul 14, 2023
56421a3
Remove references to pyomo.core.expr.current
jsiirola Jul 14, 2023
0192138
deprecate pyomo.core.expr.current
jsiirola Jul 14, 2023
1288032
Merge pull request #2897 from jsiirola/import-tester
jsiirola Jul 14, 2023
5663740
Track changes to expr.Mode
jsiirola Jul 14, 2023
1b87f3f
Apply black
jsiirola Jul 14, 2023
e97171a
Merge branch 'main' into reorg-expr-imports
jsiirola Jul 14, 2023
327a4b7
Merge remote-tracking branch 'refs/remotes/jsiirola/reorg-expr-import…
jsiirola Jul 14, 2023
7078358
Merge branch 'reorg-expr-imports' into remove-expr-current
jsiirola Jul 14, 2023
f96e90c
Track change in expr.Mode
jsiirola Jul 14, 2023
6362add
Merge branch 'reorg-expr-imports' into remove-expr-current
jsiirola Jul 14, 2023
2567886
Fix compatibility import
jsiirola Jul 14, 2023
4e14bd1
Merge branch 'reorg-expr-imports' into remove-expr-current
jsiirola Jul 14, 2023
62591ce
Update Expr_if to support Cythonization
jsiirola Jul 14, 2023
5898c22
Avoid accessing locals() when processing Expr_if args
jsiirola Jul 14, 2023
f32699f
remove config in args
ZedongPeng Jul 15, 2023
be93e57
Merge pull request #2901 from Robbybp/pynumero-eval-error
michaelbynum Jul 17, 2023
cdbf556
Merge branch 'main' into remove-expr-current
jsiirola Jul 17, 2023
50dcfdb
Merge branch 'main' into appsi_update
emma58 Jul 17, 2023
6eb6b70
Resolve exception in FileDownloader.get_os_version when lsb_release i…
jsiirola Jul 17, 2023
885e496
Fixing grammatical error
Jul 18, 2023
c3f9e03
Merge branch 'main' into inconsistent_units
Jul 18, 2023
0d9699d
Add in expected failuress for gams + MILP_unbounded
mrmundt Jul 18, 2023
f1bb3fc
Update GAMS test version
mrmundt Jul 18, 2023
42d4e38
Pin back the GAMS version and add a note
mrmundt Jul 18, 2023
d7380e2
document UnavailableClass
jsiirola Jul 18, 2023
0f17c03
document format_exception()
jsiirola Jul 18, 2023
d79faaa
move DeferredImportError to pyomo.common.errors
jsiirola Jul 18, 2023
1443ac9
Alphabetize pyomo/common/errors.py
jsiirola Jul 18, 2023
797ce70
Add pyomo.common.errors to the library reference
jsiirola Jul 18, 2023
81edab9
Clairify common documentation; update links
jsiirola Jul 18, 2023
d2e2929
Make the SymbolMap used by the GAMS writer picklable
jsiirola Jul 18, 2023
41376be
Apply black
jsiirola Jul 18, 2023
dbd4242
HACK: Manually mark the cases we want to skip
mrmundt Jul 19, 2023
e1ae3d1
Add variable, constraint names to exception messages
jsiirola Jul 19, 2023
777d242
HACK: Horrible hack but picks up the right tests
mrmundt Jul 19, 2023
4736bb3
NFC: fix typo
jsiirola Jul 19, 2023
73f872b
Improve errors raised by calculate_variable_from_constraint
jsiirola Jul 19, 2023
4f2d5fc
Merge pull request #2913 from jsiirola/gams-pickle
mrmundt Jul 19, 2023
f9306b7
NFC: Fix docstring typo in errors.py
blnicho Jul 19, 2023
848ece7
Fixing a typo in the hull transformation, and adding a test for it
emma58 Jul 19, 2023
7377920
Merge branch 'main' into common-docs
blnicho Jul 19, 2023
d844730
Merge branch 'main' into downloader-lsb-release
blnicho Jul 19, 2023
22729a2
Merge branch 'main' into mindtpy-rewrite
bernalde Jul 19, 2023
0c6e632
Deprecate pyomo.core.kernel.expression.noclone
jsiirola Jul 19, 2023
dfc2031
Always clone 'Floating' components (not attached to blocks)
jsiirola Jul 19, 2023
2904658
Resync kernel's __deepcopy__ with core.base's
jsiirola Jul 19, 2023
9a138a4
Resolve expected failures marked in #2913
jsiirola Jul 19, 2023
ccb3ffd
Remove the 'singletest' job from "branches" builds
jsiirola Jul 19, 2023
26d0014
add warmstart for ipopt
ZedongPeng Jul 20, 2023
accaa1c
Merge pull request #2916 from jsiirola/deprecate-noclone
mrmundt Jul 20, 2023
bc05ab3
Merge pull request #2915 from emma58/hull-typo-fix
mrmundt Jul 20, 2023
c70a41f
Merge pull request #2911 from jsiirola/downloader-lsb-release
mrmundt Jul 20, 2023
d4ab77f
NFC: fix grammar
jsiirola Jul 20, 2023
e8b13ad
Merge branch 'main' into calc-var-value-messages
jsiirola Jul 20, 2023
02c03dd
Apply black
jsiirola Jul 20, 2023
ad27758
Merge branch 'main' into inconsistent_units
mrmundt Jul 20, 2023
abfedb9
Merge pull request #2912 from jsiirola/common-docs
mrmundt Jul 20, 2023
48a545f
Merge branch 'main' into calc-var-value-messages
jsiirola Jul 20, 2023
25db781
Merge pull request #2917 from jsiirola/gha-remote-branches-singletest
jsiirola Jul 20, 2023
41dbae6
Merge branch 'main' into appsi_update
jsiirola Jul 20, 2023
ac109f3
Merge branch 'main' into reorg-expr-imports
jsiirola Jul 21, 2023
a64db1e
Update import location
jsiirola Jul 21, 2023
5a3af38
NFC: fix typo
jsiirola Jul 21, 2023
ade5ac0
Merge pull request #2909 from jsiirola/reorg-expr-imports
jsiirola Jul 21, 2023
d6ce2e2
Merge branch 'main' into remove-expr-current
jsiirola Jul 21, 2023
228f5eb
Merge pull request #2914 from jsiirola/calc-var-value-messages
jsiirola Jul 21, 2023
bd06ffa
NFC: fix typo
jsiirola Jul 24, 2023
080ff7d
Remove duplicate definition
jsiirola Jul 24, 2023
2212f33
Merge branch 'main' into mindtpy-rewrite
jsiirola Jul 24, 2023
9663a28
Apply black
jsiirola Jul 24, 2023
595e235
Xpress: only fall back on the LP results processor if there is no NLP…
jsiirola Jul 24, 2023
ff40919
Apply black
jsiirola Jul 24, 2023
fcac472
NFX: fix typos
jsiirola Jul 24, 2023
3379349
Merge pull request #2921 from jsiirola/xpress-nlp-status-fix
jsiirola Jul 25, 2023
e69c3ba
Merge branch 'main' into remove-expr-current
jsiirola Jul 25, 2023
32a350e
fix lp/nlp bug
ZedongPeng Jul 25, 2023
6aeeb30
Merge branch 'mindtpy-rewrite' of github.com:ZedongPeng/pyomo into mi…
ZedongPeng Jul 25, 2023
57f6ec7
set update_config for feasibility_nlp_opt
ZedongPeng Jul 25, 2023
00d4632
rename add_feas_slacks to initialize_feas_subproblem
ZedongPeng Jul 25, 2023
92ddc96
Merge branch 'main' into mindtpy-rewrite
ZedongPeng Jul 25, 2023
39ee99b
Adding logger messages
Jul 25, 2023
782747d
Merge branch 'inconsistent_units' of https://github.com/andrewlee94/p…
Jul 25, 2023
a6b8e98
Cleaning up imports, per review
jsiirola Jul 26, 2023
af569b5
pass dim=0 to _process_data_list if scalar param is encounterd, fixes…
marvin-meck Jul 26, 2023
c95e695
updated ./pyomo/dataportal/tests/test_dataportal.py to catch bug repo…
marvin-meck Jul 26, 2023
5531818
Fix model viewer
Jul 26, 2023
af89db1
Merge pull request #2904 from andrewlee94/inconsistent_units
jsiirola Jul 26, 2023
43561de
autoformatted ./pyomo/dataportal/test_dataportal.py
marvin-meck Jul 26, 2023
68d777f
Merge branch 'main' into bugfix-no120
marvin-meck Jul 26, 2023
c126225
Fix model seletor
Jul 26, 2023
a43a06b
Run black
Jul 27, 2023
934024d
Merge branch 'main' of https://github.com/pyomo/pyomo into fix_model_…
Jul 27, 2023
d5a065e
Merge pull request #2910 from jsiirola/remove-expr-current
mrmundt Jul 27, 2023
d483aab
Fix left over debug code
Jul 28, 2023
62722e0
Merge branch 'main' of https://github.com/pyomo/pyomo into fix_model_…
Jul 28, 2023
0c140de
Merge pull request #2923 from marvin-meck/bugfix-no120
jsiirola Jul 28, 2023
f1131d3
change MILP to MIP
ZedongPeng Aug 1, 2023
a47ad15
change MIQP to MIQCP
ZedongPeng Aug 1, 2023
1a6452a
change MILP to MIP
ZedongPeng Aug 1, 2023
a62bda7
fix typo
ZedongPeng Aug 1, 2023
2d06fb1
Typos version update
mrmundt Aug 1, 2023
2f84f84
Merge pull request #2931 from mrmundt/typos-update
blnicho Aug 1, 2023
cffefdd
Merge pull request #2924 from eslickj/fix_model_viewer
blnicho Aug 1, 2023
f4e4611
change MILP to MIP
ZedongPeng Aug 2, 2023
d6c149a
remove TODO
ZedongPeng Aug 2, 2023
a3bccb0
change todo to comment
ZedongPeng Aug 4, 2023
cf747c3
resolve tabu list todo
ZedongPeng Aug 4, 2023
f45d89f
change the name of simpleMINLP example
ZedongPeng Aug 4, 2023
6b26224
add special handle with mip start solution in single tree
ZedongPeng Aug 7, 2023
0a2db6a
add initial value for constraint qualification example
ZedongPeng Aug 7, 2023
aba7540
use model.clone() in mindtpy test
ZedongPeng Aug 8, 2023
4f01c92
add special handle of initial binary strategy
ZedongPeng Aug 8, 2023
724ab91
Merge branch 'mindtpy-rewrite' of github.com:ZedongPeng/pyomo into mi…
ZedongPeng Aug 8, 2023
8201e9b
black format
ZedongPeng Aug 8, 2023
6d0b94d
Merge branch 'main' into mindtpy-rewrite
ZedongPeng Aug 8, 2023
e50d220
Merge branch 'main' into appsi_update
michaelbynum Aug 8, 2023
07b8013
update comment
michaelbynum Aug 8, 2023
4ccf713
Merge remote-tracking branch 'michaelbynum/appsi_update' into appsi_u…
michaelbynum Aug 8, 2023
32561a9
merge main into empty_blocks
michaelbynum Aug 8, 2023
949a536
tests
michaelbynum Aug 8, 2023
ea331e1
Merge pull request #2903 from michaelbynum/appsi_update
michaelbynum Aug 8, 2023
472e099
Improve error message when attempting to discretize models with circu…
blnicho Aug 9, 2023
7e6b844
fix test
michaelbynum Aug 9, 2023
d5a4f8f
add description for mip_strategy_presolvenode
ZedongPeng Aug 9, 2023
e103981
remove handle_main_other_conditions function
ZedongPeng Aug 10, 2023
b20f111
change wrt to w.r.t.
ZedongPeng Aug 10, 2023
c6b637a
fix typo
ZedongPeng Aug 10, 2023
ee778cf
fix bug
ZedongPeng Aug 10, 2023
9d98391
fix typo
ZedongPeng Aug 10, 2023
0171081
change [...] to values()
ZedongPeng Aug 10, 2023
f38dbcc
fix typo
ZedongPeng Aug 10, 2023
176015b
Merge pull request #2943 from blnicho/dae-component-names
mrmundt Aug 10, 2023
190e780
add comments for callback
ZedongPeng Aug 10, 2023
e2a9fe6
improve comments
ZedongPeng Aug 10, 2023
ebf1057
fix mip_start_lazy_oa_cuts bug
ZedongPeng Aug 10, 2023
b4ff4e3
remove clone of ConstraintQualificationExample
ZedongPeng Aug 10, 2023
6e6f258
change the way of checking empty list
ZedongPeng Aug 11, 2023
2698fac
update the link of CPLEX
ZedongPeng Aug 11, 2023
cb3669a
change number to enum
ZedongPeng Aug 11, 2023
2147f11
add the log of error message
ZedongPeng Aug 11, 2023
fd36c5d
Merge branch 'main' into mindtpy-rewrite
ZedongPeng Aug 11, 2023
9ef5c32
black format
ZedongPeng Aug 11, 2023
053528e
improve constraint list and var list generation
ZedongPeng Aug 11, 2023
d5984ff
Update PR template to add linting instructions
mrmundt Aug 11, 2023
5eb37c9
Adjust formatting to avoid wraparound
mrmundt Aug 11, 2023
05ed25d
Last change didn't commit?
mrmundt Aug 11, 2023
3b3b7e7
Merge pull request #2947 from mrmundt/main
mrmundt Aug 11, 2023
ce48825
Merge branch 'main' into mindtpy-rewrite
bernalde Aug 11, 2023
526a79e
rename mindtpy_object to mindtpy_solver
ZedongPeng Aug 14, 2023
a941bd4
rename set_solver_timelimit to update_solver_timelimit
ZedongPeng Aug 14, 2023
a637a4e
change remaining time calculation from int to ceil
ZedongPeng Aug 14, 2023
c1b7667
Merge branch 'mindtpy-rewrite' of github.com:ZedongPeng/pyomo into mi…
ZedongPeng Aug 14, 2023
0eebd8f
black format
ZedongPeng Aug 14, 2023
0f9eefa
Merge branch 'main' into empty_blocks
mrmundt Aug 15, 2023
4caa306
Switch named expressions to store in
jsiirola Aug 15, 2023
dec227f
Names expressions: `expr` is guaranteed to be a NumericValue
jsiirola Aug 15, 2023
a0adec2
Define __call__ to trap unconstructed ScalarExpression/ScalarObjective
jsiirola Aug 15, 2023
f95e429
DRY: leverage _pop_from_kwargs()
jsiirola Aug 15, 2023
9520253
FBBT: access named expressions through `args`
jsiirola Aug 15, 2023
730ceb5
Apply black
jsiirola Aug 15, 2023
1cb37aa
Merge pull request #2896 from michaelbynum/empty_blocks
jsiirola Aug 15, 2023
fefbd4c
Remove HTML4 forcing
mrmundt Aug 16, 2023
a63689c
Fixing a that vs. which mistake in an error message
emma58 Aug 16, 2023
039c5ec
Resolve error categorizing some discrete domains as integer domains
jsiirola Aug 17, 2023
74ea4f7
Merge pull request #2950 from emma58/grammar-nit
mrmundt Aug 17, 2023
915f02b
Merge pull request #2949 from mrmundt/docs-theme-update
mrmundt Aug 17, 2023
99dc0f1
Merge pull request #2954 from jsiirola/var-is-integer
mrmundt Aug 17, 2023
1cf7764
NFC: cleaning up exception messages
jsiirola Aug 18, 2023
709f746
Merge branch 'main' into named-expr-is-numericvalue
jsiirola Aug 18, 2023
24170c2
Support kwargs in partial objects passed to Initializer
jsiirola Aug 21, 2023
0584744
Merge pull request #2948 from jsiirola/named-expr-is-numericvalue
mrmundt Aug 21, 2023
c569b78
Merge pull request #2960 from jsiirola/initializer-partial=kwargs
jsiirola Aug 21, 2023
676d9a2
Merge branch 'main' into mindtpy-rewrite
mrmundt Aug 21, 2023
2cb4c22
fix math domain error
ZedongPeng Aug 22, 2023
c0d8ad9
fix docstring
ZedongPeng Aug 22, 2023
fa810fd
change GUROBI to Gurobi
ZedongPeng Aug 22, 2023
8014474
remove appsi_highs support
ZedongPeng Aug 22, 2023
f26ae11
remove wrong calculate_dual_at_solution check
ZedongPeng Aug 22, 2023
3fe865d
black format
ZedongPeng Aug 22, 2023
59941ba
add comments
ZedongPeng Aug 22, 2023
987b40a
add comments for optimalitytarget
ZedongPeng Aug 22, 2023
0d9430d
black format
ZedongPeng Aug 22, 2023
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
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .coin-or/projDesc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Carl D. Laird, Chair, Pyomo Management Committee, claird at andrew dot cmu dot e
license file directly.
-->
<projectLicenseURL>
https://github.com/Pyomo/pyomo/blob/main/LICENSE.txt
https://github.com/Pyomo/pyomo/blob/main/LICENSE.md
</projectLicenseURL>

<!-- Below, you can list other COIN projects your project -->
Expand Down 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.4.2</stableVersionNumber>
<releaseNumber>6.4.2</releaseNumber>
<stableVersionNumber>6.6.1</stableVersionNumber>
<releaseNumber>6.6.1</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.7, 3.8, 3.9, 3.10</compiler>
<compiler>Python 3.7, 3.8, 3.9, 3.10, 3.11</compiler>
</platform>

</testedPlatforms>
Expand Down
46 changes: 46 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# PURPOSE: This file will ignore the included SHAs when
# running `git blame`.
# USAGE: To use this file, you can do one of the following:
# 1) git blame --ignore-revs-file .git-blame-ignore-revs
# 2) git config blame.ignoreRevsFile .git-blame-ignore-revs

# Most of these will be ignoring application
# of black to the repository
49fb44e8acb90b3019dbc21241515ae9789b9798
ce67d33762114de1bd31033b791ba38aca0360a4
6e8e1e879aa33e8917ab9ecb46371031e39c49ee
01d84aad72719f77270bc5fb15984663cc2692d3
38d7587c51c518ebf77948de43f1e7e4714b4b70
3fa9f893fc98e9c48de7652095ab815bb2a51310
bbc492a8f88a09868ba24ef99b8550cfb700d563
b991efa2916b8f2b1cdadde0f8bcc848b715db8f
7302ab9b2cbbe0792b7227c1a65298935021b874
c79e1e94f7ad28f6ddf83c3eec4db1071898b613
d0f5081da6621e45df1bed1543ebcca2fee7d2cf
bf37b8701ada7517193d9f270cc14235326ff95d
8d69faf286c623f02f48ab3bf0aa76a39bed158c
09687ab6297cb8cc2577030a8751d3b39470ef69
3acc0f41b699b57d0020fdbe44078bf36631a093
733289d6f80e2c7ea4d500be20919ffca80c452a
7102497c843e0687c4817b78f3939b1e1fff18d1
72b2dbfe34e59f60b2668e2b65bc1a439fb50b3e
3d8a9a058a548cee7716fea47d9a0e0712acb52f
ec2101738756789aa82a547013e9a345310409a7
8f53d6c3d82a42bd2324e3def60f54802f6394c1
2895da9ccb6248f41dcfe34ff23b9c5243ca2ff1
5a58691b11b6265af22bf83c4c9a88d6e76ec079
7c30d21fee6d305f30d3bc21fd7dff067951f662
d1338fa2e9015f59a0505c1561d8e12924187fd1
6ef8840eeb88978fa244c4837057e7a058756dda
597df3cf410d84f9a9f2aa91b905ef02d60d3013
f74ee5e4488e5df1dc6033226441c26e1d4a6d08
765b2fd671952bccf7f3ea78821a9267436429e0
4e811287b5695e92f8b860497f7f3336d10de787
ab66ddc816fbc7748b8ff7f5ccf29ed248e8f808
0b7b099f4578250b65cdba874dfd3a491e6007fe
69aaac0180bd4bb2088086d412f31f4a592298dd
ed13c8c65d6c3f56973887744be1c62a5d4756de
0d93f98aa608f892df404ad8015885d26e09bb55
63a3c602a00a2b747fc308c0571bbe33e55a3731
363a16a609f519b3edfdfcf40c66d6de7ac135af

3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ about: Suggest adding an enhancement of a current feature or a new feature in Py
labels: enhancement

---

<!-- 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

<!-- Please add a concise summary of your suggestion here. -->
Expand Down
9 changes: 9 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
<!-- ##################################################################### -->
<!-- PLEASE READ BEFORE OPENING THIS PULL REQUEST -->

<!-- All changes must adhere to PEP8 standards as enforced by Black. -->
<!-- If your changes do NOT adhere, the test suite will fail. -->
<!-- Please read our Contributing guide for instructions on how to apply these standards. -->
<!-- Contributing Guide: https://pyomo.readthedocs.io/en/stable/contribution_guide.html -->
<!-- ##################################################################### -->

## Fixes # .

## Summary/Motivation:
Expand Down
81 changes: 21 additions & 60 deletions .github/workflows/release_wheel_creation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,28 @@ on:
description: Git Hash (Optional)
required: false

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
PYOMO_SETUP_ARGS: --with-distributable-extensions

jobs:
manylinux:
name: ${{ matrix.TARGET }}/wheel_creation
name: ${{ matrix.TARGET }}/${{ matrix.wheel-version }}_wheel_creation
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
wheel-version: ['cp37-cp37m', 'cp38-cp38', 'cp39-cp39', 'cp310-cp310', 'cp311-cp311']
os: [ubuntu-latest]
include:
- os: ubuntu-latest
TARGET: manylinux
python-version: [3.7]
python-version: [3.8]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
Expand All @@ -35,10 +40,11 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install twine wheel setuptools pybind11
# TODO: Update the manylinux builder to next tagged release
- name: Build manylinux Python wheels
uses: RalfG/python-wheels-manylinux-build@v0.4.0-manylinux2010_x86_64
uses: RalfG/python-wheels-manylinux-build@a1e012c58ed3960f81b7ed2759a037fb0ad28e2d
with:
python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
python-versions: ${{ matrix.wheel-version }}
build-requirements: 'cython pybind11'
package-path: ''
pip-wheel-args: ''
Expand All @@ -51,56 +57,11 @@ jobs:
run: |
sudo rm -rfv dist/*-linux_x86_64.whl
- name: Upload artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: manylinux-wheels
path: dist

manylinuxaarch64:
if: ${{ false }}
name: ${{ matrix.TARGET }}/wheel_creation
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
include:
- os: ubuntu-latest
TARGET: manylinuxaarch64
python-version: [3.7]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- uses: docker/setup-qemu-action@v1
name: Set up QEMU
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install twine wheel setuptools pybind11
- name: Build manylinux Python wheels
uses: RalfG/[email protected]_aarch64
with:
python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39'
build-requirements: 'cython'
package-path: ''
pip-wheel-args: ''
# When locally testing, --no-deps flag is necessary (PyUtilib dependency will trigger an error otherwise)
- name: Consolidate wheels
run: |
sudo test -d dist || mkdir -v dist
sudo find . -name \*.whl | grep -v /dist/ | xargs -n1 -i mv -v "{}" dist/
- name: Delete linux wheels
run: |
sudo rm -rfv dist/*-linux_aarch64.whl
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: manylinux-aarch64-wheels
path: dist

generictarball:
name: ${{ matrix.TARGET }}
runs-on: ${{ matrix.os }}
Expand All @@ -111,9 +72,9 @@ jobs:
include:
- os: ubuntu-latest
TARGET: generic_tarball
python-version: [3.7]
python-version: [3.8]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
Expand All @@ -126,7 +87,7 @@ jobs:
run: |
python setup.py --without-cython sdist --format=gztar
- name: Upload artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: generictarball
path: dist
Expand All @@ -141,9 +102,9 @@ jobs:
include:
- os: macos-latest
TARGET: osx
python-version: [ 3.7, 3.8, 3.9, '3.10' ]
python-version: [ 3.7, 3.8, 3.9, '3.10', '3.11' ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
Expand All @@ -157,7 +118,7 @@ jobs:
python setup.py --with-cython --with-distributable-extensions sdist --format=gztar bdist_wheel

- name: Upload artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: osx-wheels
path: dist
Expand All @@ -172,9 +133,9 @@ jobs:
include:
- os: windows-latest
TARGET: win
python-version: [ 3.7, 3.8, 3.9, '3.10' ]
python-version: [ 3.7, 3.8, 3.9, '3.10', '3.11' ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
Expand All @@ -191,7 +152,7 @@ jobs:
$env:PYTHONWARNINGS="ignore::UserWarning"
Invoke-Expression "python setup.py --with-cython --with-distributable-extensions sdist --format=gztar bdist_wheel"
- name: Upload artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: win-wheels
path: dist
Loading