Merge branch 'main' into modernize-relax-integer-vars

Author: emma58

.github/workflows/test_branches.yml

@@ -348,7 +348,7 @@ jobs:
         if test "${{matrix.TARGET}}" == linux; then
             EXCLUDE="casadi numdifftools $EXCLUDE"
         fi
-        if [[ "${{matrix.TARGET}}" == win && "${{matrix.python}}" == "3.13" ]]; then
+        if [[ "${{matrix.TARGET}}" == win && "${{matrix.python}}" == 3.13* ]]; then
             # As of Nov 7, 2024, qtconsole is not compatible with python 3.13 on win
             EXCLUDE="qtconsole $EXCLUDE"
         fi
@@ -373,7 +373,7 @@ jobs:
         fi
         # Note: this will fail the build if any installation fails (or
         # possibly if it outputs messages to stderr)
-        conda install --update-deps -q -y $CONDA_DEPENDENCIES
+        conda install --update-deps -q -y python="${{matrix.python}}" $CONDA_DEPENDENCIES
         if test -z "${{matrix.slim}}"; then
             # xpress.init() (xpress 9.5.1 from conda) hangs indefinitely
             # on GHA/Windows under Python 3.10 and 3.11.  Exclude that

.github/workflows/test_pr_and_main.yml

@@ -400,7 +400,7 @@ jobs:
         if test "${{matrix.TARGET}}" == linux; then
             EXCLUDE="casadi numdifftools $EXCLUDE"
         fi
-        if [[ "${{matrix.TARGET}}" == win && "${{matrix.python}}" == "3.13" ]]; then
+        if [[ "${{matrix.TARGET}}" == win && "${{matrix.python}}" == 3.13* ]]; then
             # As of Nov 7, 2024, qtconsole is not compatible with python 3.13 on win
             EXCLUDE="qtconsole $EXCLUDE"
         fi
@@ -425,7 +425,7 @@ jobs:
         fi
         # Note: this will fail the build if any installation fails (or
         # possibly if it outputs messages to stderr)
-        conda install --update-deps -q -y $CONDA_DEPENDENCIES
+        conda install --update-deps -q -y python="${{matrix.python}}" $CONDA_DEPENDENCIES
         if test -z "${{matrix.slim}}"; then
             # xpress.init() (xpress 9.5.1 from conda) hangs indefinitely
             # on GHA/Windows under Python 3.10 and 3.11.  Exclude that

.github/workflows/typos.toml

@@ -71,4 +71,6 @@ EOF = "EOF"
 lst = "lst"
 # Abbreviation of gamma (used in stochpdegas1_automatic.py)
 gam = "gam"
+# Regex search term from contrib/solver/solvers/ipopt
+ond = "ond"
 # AS NEEDED: Add More Words Below

doc/OnlineDocs/_templates/recursive-base.rst

@@ -7,6 +7,11 @@
    # import everything from the module containing this class so that
    # doctests for the class docstrings see the correct environment
    from {{ module }} import *
+   try:
+       from {{ module }} import _autosummary_doctest_setup
+       _autosummary_doctest_setup()
+   except ImportError:
+       pass
 
 .. currentmodule:: {{ module }}
 

doc/OnlineDocs/_templates/recursive-class.rst

@@ -7,6 +7,11 @@
    # import everything from the module containing this class so that
    # doctests for the class docstrings see the correct environment
    from {{ module }} import *
+   try:
+       from {{ module }} import _autosummary_doctest_setup
+       _autosummary_doctest_setup()
+   except ImportError:
+       pass
 
 .. currentmodule:: {{ module }}
 

doc/OnlineDocs/_templates/recursive-enum.rst

@@ -7,6 +7,11 @@
    # import everything from the module containing this class so that
    # doctests for the class docstrings see the correct environment
    from {{ module }} import *
+   try:
+       from {{ module }} import _autosummary_doctest_setup
+       _autosummary_doctest_setup()
+   except ImportError:
+       pass
 
 .. currentmodule:: {{ module }}
 

doc/OnlineDocs/_templates/recursive-module.rst

@@ -5,6 +5,19 @@ Library Reference
 {{ name | escape | underline}}
 {% endif %}
 
+.. testsetup:: *
+
+   # import everything from the module containing this class so that
+   # doctests for the class docstrings see the correct environment
+   from {{ module }} import *
+   try:
+       from {{ module }} import _autosummary_doctest_setup
+       _autosummary_doctest_setup()
+   except ImportError:
+       pass
+
+.. currentmodule:: {{ module }}
+
 .. automodule:: {{ fullname }}
    :undoc-members:
 

doc/OnlineDocs/errors.rst

@@ -8,10 +8,13 @@ Common Warnings/Errors
    for backwards compatibility, DO NOT recycle old ID (no longer used)
    numbers.
 
-.. doctest::
-   :hide:
+.. testsetup::
 
-   >>> import pyomo.environ as pyo
+   import pyomo.environ as pyo
+   # Ensure that all logged messages are sent to stdout
+   # (so they show up in the doctest output and can be tested)
+   import pyomo.common.log as _log
+   _log.pyomo_handler.__class__ = _log.StdoutHandler
 
 .. py:currentmodule:: pyomo.environ
 

doc/OnlineDocs/explanation/analysis/parmest/installation.rst

@@ -21,7 +21,7 @@ Python package dependencies
 IPOPT
 -----
 
-IPOPT can be downloaded from https://projects.coin-or.org/Ipopt. 
+The IPOPT project homepage is https://github.com/coin-or/Ipopt
 
 Testing
 -------

doc/OnlineDocs/explanation/analysis/sensitivity_toolbox.rst

@@ -3,7 +3,7 @@ Sensitivity Toolbox
 
 The sensitivity toolbox provides a Pyomo interface to sIPOPT and k_aug to very quickly compute approximate solutions to nonlinear programs with a small perturbation in model parameters.
 
-See the `sIPOPT documentation <https://projects.coin-or.org/Ipopt/wiki/sIpopt>`_ or the `following paper <https://link.springer.com/article/10.1007/s12532-012-0043-2>`_ for additional details:
+See the `sIPOPT documentation <https://coin-or.github.io/Ipopt/SPECIALS.html#SIPOPT>`_ or the `following paper <https://link.springer.com/article/10.1007/s12532-012-0043-2>`_ for additional details:
 
   H. Pirnay, R. Lopez-Negrete, and L.T. Biegler, Optimal Sensitivity based on IPOPT, Math. Prog. Comp., 4(4):307--331, 2012.
 
@@ -185,7 +185,7 @@ Installing sIPOPT and k_aug
 The sensitivity toolbox requires either sIPOPT or k_aug to be installed and available in your system PATH. See the sIPOPT and k_aug documentation for detailed instructions:
 
 * https://coin-or.github.io/Ipopt/INSTALL.html
-* https://projects.coin-or.org/Ipopt/wiki/sIpopt
+* https://coin-or.github.io/Ipopt/SPECIALS.html#SIPOPT
 * https://coin-or.github.io/coinbrew/
 * https://github.com/dthierry/k_aug