Merge branch 'main' into gams-gurobi_fix

Author: blnicho

.github/workflows/typos.toml

@@ -73,4 +73,6 @@ lst = "lst"
 gam = "gam"
 # Regex search term from contrib/solver/solvers/ipopt
 ond = "ond"
+# GAMS_writer
+PATHC = "PATHC"
 # AS NEEDED: Add More Words Below

CHANGELOG.md

@@ -1442,7 +1442,7 @@ ADVANCE CHANGE NOTICE:
 - DAE Updates
   - Extend flattener to allow multiple sets (#1768)
 - GDP Updates
-  - Fix subproblem initialiations in gdp.cuttingplane (#1780)
+  - Fix subproblem initializations in gdp.cuttingplane (#1780)
 - Testing
   - Fix Jenkins test script (#1771)
   - Fix GHA tests to work with PyMySQL 1.0.0 (#1777)

doc/OnlineDocs/explanation/developer_utils/config.rst

@@ -124,7 +124,7 @@ derived classes.  Consider the following example:
 
 .. doctest::
 
-    >>> class Base(object):
+    >>> class Base:
     ...     CONFIG = ConfigDict()
     ...     CONFIG.declare('filename', ConfigValue(
     ...         default='input.txt',
@@ -168,7 +168,7 @@ and for use by each ``solve()`` call:
 
 .. testcode::
 
-   class Solver(object):
+   class Solver:
        CONFIG = ConfigDict()
        CONFIG.declare('iterlim', ConfigValue(
            default=10,
@@ -206,7 +206,7 @@ attributes:
    from pyomo.common.config import document_class_CONFIG
 
    @document_class_CONFIG(methods=['solve'])
-   class MySolver(object):
+   class MySolver:
        """Interface to My Solver"""
        #
        #: Global class configuration; see :ref:`MySolver_CONFIG`

doc/OnlineDocs/explanation/modeling_utils/flattener/index.rst

@@ -48,7 +48,7 @@ Citation
 --------
 If you use the ``pyomo.dae.flatten`` module in your research, we would appreciate
 you citing the following paper, which gives more detail about the motivation for
-and examples of using this functinoality.
+and examples of using this functionality.
 
 .. code-block:: bibtex
 

examples/dae/ReactionKinetics.py

@@ -28,7 +28,7 @@
 solver = pyo.SolverFactory('ipopt')
 
 
-class Reaction(object):
+class Reaction:
     """A simple class to hold the stoichiometry of a single reaction
 
     Reaction data is stored in two dictionaries:
@@ -84,7 +84,7 @@ def _parseTerm(self, x):
         return coef, species.strip()
 
 
-class ReactionNetwork(object):
+class ReactionNetwork:
     """A simple object to hold sets of reactions."""
 
     def __init__(self):

examples/mpec/munson1.yml

@@ -11,7 +11,7 @@ model:
   file determinism: 1            # When interfacing with a solver using file
                                  #   based I/O, set the effort level for
                                  #   ensuring the file creation process is
-                                 #   determistic. The default (1) sorts the
+                                 #   deterministic. The default (1) sorts the
                                  #   index of components when transforming the
                                  #   model. Anything less than 1 disables
                                  #   index sorting. Anything greater than 1

examples/pyomo/p-median/solver1.py

@@ -17,7 +17,7 @@
 
 
 @plugin_factory(pyo.SolverFactory)
-class MySolver(object):
+class MySolver:
     alias('greedy')
 
     # Declare that this is an IOptSolver plugin

examples/pyomo/p-median/solver2.py

@@ -18,7 +18,7 @@
 
 
 @plugin_factory
-class MySolver(object):
+class MySolver:
     alias('random')
 
     # Declare that this is an IOptSolver plugin

examples/pyomo/radertext/Ex2_3.py

@@ -40,7 +40,7 @@
     model.CrudeType, model.GasType, within=pyo.NonNegativeReals, default=0
 )
 
-# Variabls
+# Variables
 model.x = pyo.Var(model.CrudeType, model.GasType, within=pyo.NonNegativeReals)
 model.q = pyo.Var(model.CrudeType, within=pyo.NonNegativeReals)
 model.z = pyo.Var(model.GasType, within=pyo.NonNegativeReals)

pyomo/common/autoslots.py

@@ -276,7 +276,7 @@ def encode_as_none(encode, val):
         else:
             return val
 
-    class Mixin(object):
+    class Mixin:
         """Mixin class to configure a class hierarchy to use AutoSlots
 
         Inheriting from this class will set up the automatic generation