Merge branch 'main' into xpress-check-license

jsiirola · Nov 4, 2024 · 97b4fd4 · 97b4fd4
2 parents 4d3b555 + feb8c55
commit 97b4fd4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/doc/OnlineDocs/howto/manipulating.rst b/doc/OnlineDocs/howto/manipulating.rst
@@ -162,7 +162,7 @@ that the expression be greater than or equal to one:
 .. literalinclude:: /src/scripting/iterative1_Add_expression_constraint.spy
    :language: python
 
-The proof that this precludes the last solution is left as an exerise
+The proof that this precludes the last solution is left as an exercise
 for the reader.
 
 The final lines in the outer for loop find a solution and display it:

diff --git a/pyomo/contrib/gdpopt/config_options.py b/pyomo/contrib/gdpopt/config_options.py
@@ -436,7 +436,7 @@ def _add_mip_solver_configs(CONFIG):
         ConfigValue(
             default="gurobi",
             description="""
-            Mixed-integer linear solver to use. Note that no persisent solvers
+            Mixed-integer linear solver to use. Note that no persistent solvers
             other than the auto-persistent solvers in the APPSI package are
             supported.""",
         ),
@@ -457,7 +457,7 @@ def _add_nlp_solver_configs(CONFIG, default_solver):
         ConfigValue(
             default=default_solver,
             description="""
-            Nonlinear solver to use. Note that no persisent solvers
+            Nonlinear solver to use. Note that no persistent solvers
             other than the auto-persistent solvers in the APPSI package are
             supported.""",
         ),
@@ -475,7 +475,7 @@ def _add_nlp_solver_configs(CONFIG, default_solver):
         ConfigValue(
             default="baron",
             description="""
-            Mixed-integer nonlinear solver to use. Note that no persisent solvers
+            Mixed-integer nonlinear solver to use. Note that no persistent solvers
             other than the auto-persistent solvers in the APPSI package are
             supported.""",
         ),
@@ -493,7 +493,7 @@ def _add_nlp_solver_configs(CONFIG, default_solver):
         ConfigValue(
             default="bonmin",
             description="""
-            Mixed-integer nonlinear solver to use. Note that no persisent solvers
+            Mixed-integer nonlinear solver to use. Note that no persistent solvers
             other than the auto-persistent solvers in the APPSI package are
             supported.""",
         ),

diff --git a/pyomo/core/tests/unit/test_numeric_expr.py b/pyomo/core/tests/unit/test_numeric_expr.py
@@ -3477,7 +3477,7 @@ def test_nonpolynomial_pow(self):
     def test_Expr_if(self):
         m = self.instance
         #
-        # When IF conditional is constant, then polynomial degree is propigated
+        # When IF conditional is constant, then polynomial degree is propagated
         #
         expr = Expr_if(1, m.a**3, m.a**2)
         self.assertEqual(expr.polynomial_degree(), 3)

diff --git a/pyomo/scripting/driver_help.py b/pyomo/scripting/driver_help.py
@@ -189,7 +189,7 @@ def help_transformations():
         # The next best thing is to ensure that the deprecation status
         # is indicated here.
         _init_doc = TransformationFactory.get_class(xform).__init__.__doc__ or ""
-        if _init_doc.strip().startswith('DEPRECATED') and 'DEPRECAT' not in _doc:
+        if _init_doc.strip().startswith('DEPRECATED') and 'DEPRECATE' not in _doc:
             _doc = ' '.join(('[DEPRECATED]', _doc))
         if _doc:
             print(wrapper.fill(_doc))