Change deprecated versions to 6.6.0

mrmundt · mrmundt · commit 6545ef1af359 · 2023-05-24T15:39:02.000-06:00
diff --git a/pyomo/common/config.py b/pyomo/common/config.py
@@ -1443,7 +1443,7 @@ def _finalize(self):
 @deprecated(
     "add_docstring_list is deprecated.  Please use the "
     "@document_kwargs_from_configdict() decorator.",
-    version='6.5.1.dev0',
+    version='6.6.0',
 )
 def add_docstring_list(docstring, configdict, indent_by=4):
     """Returns the docstring with a formatted configuration arguments listing."""
@@ -2010,7 +2010,7 @@ def generate_documentation(
                     f"Overriding '{name}' by passing strings to "
                     "generate_documentation is deprecated.  Create an instance of a "
                     "StringConfigFormatter and pass it as the 'format' argument.",
-                    version='6.5.1.dev0',
+                    version='6.6.0',
                 )
                 setattr(
                     formatter, "_" + name, _formatter_str_to_callback(arg, formatter)
@@ -2020,7 +2020,7 @@ def generate_documentation(
                 f"Overriding 'item_body' by passing strings to "
                 "generate_documentation is deprecated.  Create an instance of a "
                 "StringConfigFormatter and pass it as the 'format' argument.",
-                version='6.5.1.dev0',
+                version='6.6.0',
             )
             setattr(
                 formatter,
diff --git a/pyomo/common/numeric_types.py b/pyomo/common/numeric_types.py
@@ -44,7 +44,7 @@
 relocated_module_attribute(
     'native_boolean_types',
     'pyomo.common.numeric_types._native_boolean_types',
-    version='6.5.1.dev0',
+    version='6.6.0',
     msg="The native_boolean_types set will be removed in the future: the set "
     "contains types that were convertible to bool, and not types that should "
     "be treated as if they were bool (as was the case for the other "
@@ -96,7 +96,7 @@ def RegisterIntegerType(new_type):
 @deprecated(
     "The native_boolean_types set (and hence RegisterBooleanType) "
     "is deprecated.  Users likely should use RegisterLogicalType.",
-    version='6.5.1.dev0',
+    version='6.6.0',
 )
 def RegisterBooleanType(new_type):
     """
diff --git a/pyomo/contrib/pynumero/algorithms/solvers/cyipopt_solver.py b/pyomo/contrib/pynumero/algorithms/solvers/cyipopt_solver.py
@@ -47,17 +47,17 @@
 relocated_module_attribute(
     "cyipopt_available",
     "pyomo.contrib.pynumero.interfaces.cyipopt_interface.cyipopt_available",
-    "6.5.1.dev0",
+    "6.6.0",
 )
 relocated_module_attribute(
     "CyIpoptProblemInterface",
     "pyomo.contrib.pynumero.interfaces.cyipopt_interface.CyIpoptProblemInterface",
-    "6.5.1.dev0",
+    "6.6.0",
 )
 relocated_module_attribute(
     "CyIpoptNLP",
     "pyomo.contrib.pynumero.interfaces.cyipopt_interface.CyIpoptNLP",
-    "6.5.1.dev0",
+    "6.6.0",
 )
 
 from pyomo.common.config import ConfigBlock, ConfigValue
diff --git a/pyomo/contrib/pynumero/interfaces/ampl_nlp.py b/pyomo/contrib/pynumero/interfaces/ampl_nlp.py
@@ -773,7 +773,7 @@ def primals_names(self):
 
     @deprecated(
         msg='This method has been replaced with primals_names',
-        version='6.0.0.dev0',
+        version='6.0.0',
         remove_in='6.0',
     )
     def variable_names(self):
@@ -797,7 +797,7 @@ def ineq_constraint_names(self):
 
     @deprecated(
         msg='This method has been replaced with primal_idx',
-        version='6.0.0.dev0',
+        version='6.0.0',
         remove_in='6.0',
     )
     def variable_idx(self, var_name):
diff --git a/pyomo/contrib/pynumero/interfaces/pyomo_nlp.py b/pyomo/contrib/pynumero/interfaces/pyomo_nlp.py
@@ -1,4 +1,3 @@
-#  ___________________________________________________________________________
 #
 #  Pyomo: Python Optimization Modeling Objects
 #  Copyright (c) 2008-2022
@@ -185,7 +184,7 @@ def get_pyomo_inequality_constraints(self):
 
     @deprecated(
         msg='This method has been replaced with primals_names',
-        version='6.0.0.dev0',
+        version='6.0.0',
         remove_in='6.0',
     )
     def variable_names(self):
@@ -1109,7 +1108,7 @@ def report_solver_status(self, status_code, status_message):
 
     @deprecated(
         msg='This method has been replaced with primals_names',
-        version='6.0.0.dev0',
+        version='6.0.0',
         remove_in='6.0',
     )
     def variable_names(self):
diff --git a/pyomo/core/base/block.py b/pyomo/core/base/block.py
@@ -1613,7 +1613,7 @@ def component_data_objects(
         "The component_data_iterindex method is deprecated.  "
         "Components now know their index, so it is more efficient to use the "
         "Block.component_data_objects() method followed by .index().",
-        version="6.5.1.dev0",
+        version="6.6.0",
     )
     def component_data_iterindex(
         self, ctype=None, active=None, sort=False, descend_into=True, descent_order=None
diff --git a/pyomo/core/base/indexed_component.py b/pyomo/core/base/indexed_component.py
@@ -438,7 +438,7 @@ def keys(self, sort=SortComponents.UNSORTED, ordered=NOTSET):
             deprecation_warning(
                 f"keys(ordered={ordered}) is deprecated.  "
                 "Please use `sort=SortComponents.ORDERED_INDICES`",
-                version='6.5.1.dev0',
+                version='6.6.0',
             )
             if ordered:
                 sort = sort | SortComponents.ORDERED_INDICES
@@ -529,7 +529,7 @@ def values(self, sort=SortComponents.UNSORTED, ordered=NOTSET):
             deprecation_warning(
                 f"values(ordered={ordered}) is deprecated.  "
                 "Please use `sort=SortComponents.ORDERED_INDICES`",
-                version='6.5.1.dev0',
+                version='6.6.0',
             )
             if ordered:
                 sort = SortComponents(sort) | SortComponents.ORDERED_INDICES
@@ -564,7 +564,7 @@ def items(self, sort=SortComponents.UNSORTED, ordered=NOTSET):
             deprecation_warning(
                 f"items(ordered={ordered}) is deprecated.  "
                 "Please use `sort=SortComponents.ORDERED_INDICES`",
-                version='6.5.1.dev0',
+                version='6.6.0',
             )
             if ordered:
                 sort = SortComponents(sort) | SortComponents.ORDERED_INDICES
diff --git a/pyomo/core/expr/numeric_expr.py b/pyomo/core/expr/numeric_expr.py
@@ -696,7 +696,7 @@ def _to_string(self, values, verbose, smap):
     @deprecated(
         "SumExpression.add() is deprecated.  Please use regular Python operators "
         "(infix '+' or inplace '+='.)",
-        version='6.5.1.dev0',
+        version='6.6.0',
     )
     def add(self, new_arg):
         self += new_arg
diff --git a/pyomo/core/expr/numvalue.py b/pyomo/core/expr/numvalue.py
@@ -75,7 +75,7 @@
 relocated_module_attribute(
     'native_boolean_types',
     'pyomo.common.numeric_types._native_boolean_types',
-    version='6.5.1.dev0',
+    version='6.6.0',
     f_globals=globals(),
     msg="The native_boolean_types set will be removed in the future: the set "
     "contains types that were convertible to bool, and not types that should "
@@ -85,19 +85,19 @@
 relocated_module_attribute(
     'RegisterNumericType',
     'pyomo.common.numeric_types.RegisterNumericType',
-    version='6.5.1.dev0',
+    version='6.6.0',
     f_globals=globals(),
 )
 relocated_module_attribute(
     'RegisterIntegerType',
     'pyomo.common.numeric_types.RegisterIntegerType',
-    version='6.5.1.dev0',
+    version='6.6.0',
     f_globals=globals(),
 )
 relocated_module_attribute(
     'RegisterBooleanType',
     'pyomo.common.numeric_types.RegisterBooleanType',
-    version='6.5.1.dev0',
+    version='6.6.0',
     f_globals=globals(),
 )
 
diff --git a/pyomo/core/util.py b/pyomo/core/util.py
@@ -94,7 +94,7 @@ def quicksum(args, start=0, linear=None):
     if linear is not None:
         deprecation_warning(
             "The quicksum(linear=...) argument is deprecated and ignored.",
-            version='6.5.1.dev0',
+            version='6.6.0',
         )
 
     #
diff --git a/pyomo/repn/linear.py b/pyomo/repn/linear.py
@@ -220,7 +220,7 @@ def _handle_product_constant_constant(visitor, node, arg1, arg2):
                 "Mapping the NaN result to 0 for compatibility "
                 "with the lp_v1 writer.  In the future, this NaN "
                 "will be preserved/emitted to comply with IEEE-754.",
-                version='6.5.1.dev0',
+                version='6.6.0',
             )
             return _, 0
     return _, arg1 * arg2
@@ -628,7 +628,7 @@ def _before_monomial(visitor, child):
                 "Mapping the NaN result to 0 for compatibility "
                 "with the lp_v1 writer.  In the future, this NaN "
                 "will be preserved/emitted to comply with IEEE-754.",
-                version='6.5.1.dev0',
+                version='6.6.0',
             )
         return False, (_CONSTANT, arg1)
 
@@ -669,7 +669,7 @@ def _before_linear(visitor, child):
                         "Mapping the NaN result to 0 for compatibility "
                         "with the lp_v1 writer.  In the future, this NaN "
                         "will be preserved/emitted to comply with IEEE-754.",
-                        version='6.5.1.dev0',
+                        version='6.6.0',
                     )
                 continue
             _id = id(arg2)
@@ -914,7 +914,7 @@ def finalizeResult(self, result):
                         "Mapping the NaN result to 0 for compatibility "
                         "with the lp_v1 writer.  In the future, this NaN "
                         "will be preserved/emitted to comply with IEEE-754.",
-                        version='6.5.1.dev0',
+                        version='6.6.0',
                     )
                 return self.Result()
             else:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# ___________________________________________________________________________`
`2`	`1`	`#`
`3`	`2`	`# Pyomo: Python Optimization Modeling Objects`
`4`	`3`	`# Copyright (c) 2008-2022`
`@@ -185,7 +184,7 @@ def get_pyomo_inequality_constraints(self):`
`185`	`184`
`186`	`185`	`@deprecated(`
`187`	`186`	`msg='This method has been replaced with primals_names',`
`188`		`- version='6.0.0.dev0',`
	`187`	`+ version='6.0.0',`
`189`	`188`	`remove_in='6.0',`
`190`	`189`	`)`
`191`	`190`	`def variable_names(self):`
`@@ -1109,7 +1108,7 @@ def report_solver_status(self, status_code, status_message):`
`1109`	`1108`
`1110`	`1109`	`@deprecated(`
`1111`	`1110`	`msg='This method has been replaced with primals_names',`
`1112`		`- version='6.0.0.dev0',`
	`1111`	`+ version='6.0.0',`
`1113`	`1112`	`remove_in='6.0',`
`1114`	`1113`	`)`
`1115`	`1114`	`def variable_names(self):`
Original file line number	Diff line number	Diff line change
`@@ -1613,7 +1613,7 @@ def component_data_objects(`
`1613`	`1613`	`"The component_data_iterindex method is deprecated. "`
`1614`	`1614`	`"Components now know their index, so it is more efficient to use the "`
`1615`	`1615`	`"Block.component_data_objects() method followed by .index().",`
`1616`		`- version="6.5.1.dev0",`
	`1616`	`+ version="6.6.0",`
`1617`	`1617`	`)`
`1618`	`1618`	`def component_data_iterindex(`
`1619`	`1619`	`self, ctype=None, active=None, sort=False, descend_into=True, descent_order=None`
Original file line number	Diff line number	Diff line change
`@@ -696,7 +696,7 @@ def _to_string(self, values, verbose, smap):`
`696`	`696`	`@deprecated(`
`697`	`697`	`"SumExpression.add() is deprecated. Please use regular Python operators "`
`698`	`698`	`"(infix '+' or inplace '+='.)",`
`699`		`- version='6.5.1.dev0',`
	`699`	`+ version='6.6.0',`
`700`	`700`	`)`
`701`	`701`	`def add(self, new_arg):`
`702`	`702`	`self += new_arg`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ def quicksum(args, start=0, linear=None):`
`94`	`94`	`if linear is not None:`
`95`	`95`	`deprecation_warning(`
`96`	`96`	`"The quicksum(linear=...) argument is deprecated and ignored.",`
`97`		`- version='6.5.1.dev0',`
	`97`	`+ version='6.6.0',`
`98`	`98`	`)`
`99`	`99`
`100`	`100`	`#`