Merge branch 'main' into mis

DLWoodruff · Mar 1, 2024 · a24432b · a24432b
2 parents 9a32b21 + 2954417
commit a24432b
Show file tree

Hide file tree

Showing 39 changed files with 826 additions and 438 deletions.
diff --git a/doc/OnlineDocs/conf.py b/doc/OnlineDocs/conf.py
@@ -271,7 +271,7 @@ def check_output(self, want, got, optionflags):
     yaml_available, networkx_available, matplotlib_available,
     pympler_available, dill_available,
 )
-pint_available = attempt_import('pint', defer_check=False)[1]
+pint_available = attempt_import('pint', defer_import=False)[1]
 from pyomo.contrib.parmest.parmest import parmest_available
 
 import pyomo.environ as _pe # (trigger all plugin registrations)

diff --git a/doc/OnlineDocs/contributed_packages/pyros.rst b/doc/OnlineDocs/contributed_packages/pyros.rst
@@ -689,7 +689,7 @@ could have been equivalently written as:
   ...     },
   ... )
   ==============================================================================
-  PyROS: The Pyomo Robust Optimization Solver.
+  PyROS: The Pyomo Robust Optimization Solver...
   ...
   ------------------------------------------------------------------------------
   Robust optimal solution identified.