Setting final deprecation version strings

Author: jsiirola

pyomo/common/dependencies.py

@@ -611,7 +611,7 @@ def attempt_import(
         want to import/return the first one that is available.
 
     defer_check: bool, optional
-        DEPRECATED: renamed to ``defer_import`` (deprecated in version 6.7.2.dev0)
+        DEPRECATED: renamed to ``defer_import`` (deprecated in version 6.7.2)
 
     defer_import: bool, optional
         If True, then the attempted import is deferred until the first
@@ -674,7 +674,7 @@ def attempt_import(
     if defer_check is not None:
         deprecation_warning(
             'defer_check=%s is deprecated.  Please use defer_import' % (defer_check,),
-            version='6.7.2.dev0',
+            version='6.7.2',
         )
         assert defer_import is None
         defer_import = defer_check
@@ -787,7 +787,7 @@ def _perform_import(
 @deprecated(
     "``declare_deferred_modules_as_importable()`` is deprecated.  "
     "Use the :py:class:`declare_modules_as_importable` context manager.",
-    version='6.7.2.dev0',
+    version='6.7.2',
 )
 def declare_deferred_modules_as_importable(globals_dict):
     """Make all :py:class:`DeferredImportModules` in ``globals_dict`` importable

pyomo/common/numeric_types.py

@@ -64,7 +64,7 @@
 relocated_module_attribute(
     'pyomo_constant_types',
     'pyomo.common.numeric_types._pyomo_constant_types',
-    version='6.7.2.dev0',
+    version='6.7.2',
     msg="The pyomo_constant_types set will be removed in the future: the set "
     "contained only NumericConstant and _PythonCallbackFunctionID, and provided "
     "no meaningful value to clients or walkers.  Users should likely handle "

pyomo/contrib/incidence_analysis/interface.py

@@ -891,9 +891,9 @@ def remove_nodes(self, variables=None, constraints=None):
 
         .. note::
 
-           **Deprecation in Pyomo v6.7.2.dev0**
+           **Deprecation in Pyomo v6.7.2**
 
-           The pre-6.7.2.dev0 implementation of ``remove_nodes`` allowed variables and
+           The pre-6.7.2 implementation of ``remove_nodes`` allowed variables and
            constraints to remove to be specified in a single list. This made
            error checking difficult, and indeed, if invalid components were
            provided, we carried on silently instead of throwing an error or
@@ -923,7 +923,7 @@ def remove_nodes(self, variables=None, constraints=None):
         if any(var in self._con_index_map for var in variables) or any(
             con in self._var_index_map for con in constraints
         ):
-            deprecation_warning(depr_msg, version="6.7.2.dev0")
+            deprecation_warning(depr_msg, version="6.7.2")
         # If we received variables/constraints in the same list, sort them.
         # Any unrecognized objects will be caught by _validate_input.
         for var in variables:

pyomo/contrib/parmest/parmest.py

@@ -68,8 +68,6 @@
 from pyomo.common.deprecation import deprecated
 from pyomo.common.deprecation import deprecation_warning
 
-DEPRECATION_VERSION = '6.7.2.dev0'
-
 parmest_available = numpy_available & pandas_available & scipy_available
 
 inverse_reduced_hessian, inverse_reduced_hessian_available = attempt_import(
@@ -338,7 +336,7 @@ def _deprecated_init(
             "You're using the deprecated parmest interface (model_function, "
             "data, theta_names). This interface will be removed in a future release, "
             "please update to the new parmest interface using experiment lists.",
-            version=DEPRECATION_VERSION,
+            version='6.7.2',
         )
         self.pest_deprecated = _DeprecatedEstimator(
             model_function,
@@ -1386,7 +1384,7 @@ def confidence_region_test(
 ################################
 
 
-@deprecated(version=DEPRECATION_VERSION)
+@deprecated(version='6.7.2')
 def group_data(data, groupby_column_name, use_mean=None):
     """
     Group data by scenario

pyomo/core/base/__init__.py

@@ -163,13 +163,13 @@
 )
 # Historically, only a subset of "private" component data classes were imported here
 relocated_module_attribute(
-    f'_GeneralVarData', f'pyomo.core.base.VarData', version='6.7.2.dev0'
+    f'_GeneralVarData', f'pyomo.core.base.VarData', version='6.7.2'
 )
 relocated_module_attribute(
-    f'_GeneralBooleanVarData', f'pyomo.core.base.BooleanVarData', version='6.7.2.dev0'
+    f'_GeneralBooleanVarData', f'pyomo.core.base.BooleanVarData', version='6.7.2'
 )
 relocated_module_attribute(
-    f'_ExpressionData', f'pyomo.core.base.NamedExpressionData', version='6.7.2.dev0'
+    f'_ExpressionData', f'pyomo.core.base.NamedExpressionData', version='6.7.2'
 )
 for _cdata in (
     'ConstraintData',
@@ -179,7 +179,7 @@
     'ObjectiveData',
 ):
     relocated_module_attribute(
-        f'_{_cdata}', f'pyomo.core.base.{_cdata}', version='6.7.2.dev0'
+        f'_{_cdata}', f'pyomo.core.base.{_cdata}', version='6.7.2'
     )
 del _cdata
 del relocated_module_attribute

pyomo/core/base/block.py

@@ -1983,7 +1983,7 @@ def private_data(self, scope=None):
 
 class _BlockData(metaclass=RenamedClass):
     __renamed__new_class__ = BlockData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 @ModelComponentFactory.register(

pyomo/core/base/boolean_var.py

@@ -252,12 +252,12 @@ def free(self):
 
 class _BooleanVarData(metaclass=RenamedClass):
     __renamed__new_class__ = BooleanVarData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 class _GeneralBooleanVarData(metaclass=RenamedClass):
     __renamed__new_class__ = BooleanVarData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 @ModelComponentFactory.register("Logical decision variables.")

pyomo/core/base/component.py

@@ -477,7 +477,7 @@ def _pprint_base_impl(
 
 class _ComponentBase(metaclass=RenamedClass):
     __renamed__new_class__ = ComponentBase
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 class Component(ComponentBase):
@@ -663,7 +663,7 @@ def getname(self, fully_qualified=False, name_buffer=None, relative_to=None):
                 "use of this argument poses risks if the buffer contains "
                 "names relative to different Blocks in the model hierarchy or "
                 "a mixture of local and fully_qualified names.",
-                version='TODO',
+                version='6.4.1',
             )
             name_buffer[id(self)] = ans
         return ans
@@ -922,7 +922,7 @@ def getname(self, fully_qualified=False, name_buffer=None, relative_to=None):
                 "use of this argument poses risks if the buffer contains "
                 "names relative to different Blocks in the model hierarchy or "
                 "a mixture of local and fully_qualified names.",
-                version='TODO',
+                version='6.4.1',
             )
             if id(self) in name_buffer:
                 # Return the name if it is in the buffer

pyomo/core/base/connector.py

@@ -107,7 +107,7 @@ def _iter_vars(self):
 
 class _ConnectorData(metaclass=RenamedClass):
     __renamed__new_class__ = ConnectorData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 @ModelComponentFactory.register(

pyomo/core/base/constraint.py

@@ -577,12 +577,12 @@ def slack(self):
 
 class _ConstraintData(metaclass=RenamedClass):
     __renamed__new_class__ = ConstraintData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 class _GeneralConstraintData(metaclass=RenamedClass):
     __renamed__new_class__ = ConstraintData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 @ModelComponentFactory.register("General constraint expressions.")

pyomo/core/base/expression.py

@@ -198,12 +198,12 @@ def __ipow__(self, other):
 
 class _ExpressionData(metaclass=RenamedClass):
     __renamed__new_class__ = NamedExpressionData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 class _GeneralExpressionDataImpl(metaclass=RenamedClass):
     __renamed__new_class__ = NamedExpressionData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 class ExpressionData(NamedExpressionData, ComponentData):
@@ -231,7 +231,7 @@ def __init__(self, expr=None, component=None):
 
 class _GeneralExpressionData(metaclass=RenamedClass):
     __renamed__new_class__ = ExpressionData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 @ModelComponentFactory.register(

pyomo/core/base/logical_constraint.py

@@ -124,12 +124,12 @@ def get_value(self):
 
 class _LogicalConstraintData(metaclass=RenamedClass):
     __renamed__new_class__ = LogicalConstraintData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 class _GeneralLogicalConstraintData(metaclass=RenamedClass):
     __renamed__new_class__ = LogicalConstraintData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 @ModelComponentFactory.register("General logical constraints.")

pyomo/core/base/objective.py

@@ -145,12 +145,12 @@ def set_sense(self, sense):
 
 class _ObjectiveData(metaclass=RenamedClass):
     __renamed__new_class__ = ObjectiveData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 class _GeneralObjectiveData(metaclass=RenamedClass):
     __renamed__new_class__ = ObjectiveData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 @ModelComponentFactory.register("Expressions that are minimized or maximized.")

pyomo/core/base/param.py

@@ -254,7 +254,7 @@ def _compute_polynomial_degree(self, result):
 
 class _ParamData(metaclass=RenamedClass):
     __renamed__new_class__ = ParamData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 @ModelComponentFactory.register(

pyomo/core/base/piecewise.py

@@ -274,7 +274,7 @@ def __call__(self, x):
 
 class _PiecewiseData(metaclass=RenamedClass):
     __renamed__new_class__ = PiecewiseData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 class _SimpleSinglePiecewise(object):

pyomo/core/base/set.py

@@ -1179,12 +1179,12 @@ def __gt__(self, other):
 
 class _SetData(metaclass=RenamedClass):
     __renamed__new_class__ = SetData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 class _SetDataBase(metaclass=RenamedClass):
     __renamed__new_class__ = SetData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 class _FiniteSetMixin(object):
@@ -1471,7 +1471,7 @@ def pop(self):
 
 class _FiniteSetData(metaclass=RenamedClass):
     __renamed__new_class__ = FiniteSetData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 class _ScalarOrderedSetMixin(object):
@@ -1736,7 +1736,7 @@ def ord(self, item):
 
 class _OrderedSetData(metaclass=RenamedClass):
     __renamed__new_class__ = OrderedSetData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 class InsertionOrderSetData(OrderedSetData):
@@ -1775,7 +1775,7 @@ def update(self, values):
 
 class _InsertionOrderSetData(metaclass=RenamedClass):
     __renamed__new_class__ = InsertionOrderSetData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 class _SortedSetMixin(object):
@@ -1871,7 +1871,7 @@ def _sort(self):
 
 class _SortedSetData(metaclass=RenamedClass):
     __renamed__new_class__ = SortedSetData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 ############################################################################
@@ -2669,7 +2669,7 @@ def ranges(self):
 
 class _InfiniteRangeSetData(metaclass=RenamedClass):
     __renamed__new_class__ = InfiniteRangeSetData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 class FiniteRangeSetData(
@@ -2782,7 +2782,7 @@ def ord(self, item):
 
 class _FiniteRangeSetData(metaclass=RenamedClass):
     __renamed__new_class__ = FiniteRangeSetData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 @ModelComponentFactory.register(

pyomo/core/base/sos.py

@@ -103,7 +103,7 @@ def set_items(self, variables, weights):
 
 class _SOSConstraintData(metaclass=RenamedClass):
     __renamed__new_class__ = SOSConstraintData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 @ModelComponentFactory.register("SOS constraint expressions.")

pyomo/core/base/var.py

@@ -572,12 +572,12 @@ def _process_bound(self, val, bound_type):
 
 class _VarData(metaclass=RenamedClass):
     __renamed__new_class__ = VarData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 class _GeneralVarData(metaclass=RenamedClass):
     __renamed__new_class__ = VarData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 @ModelComponentFactory.register("Decision variables.")

pyomo/core/expr/numvalue.py

@@ -47,7 +47,7 @@
 relocated_module_attribute(
     'pyomo_constant_types',
     'pyomo.common.numeric_types._pyomo_constant_types',
-    version='6.7.2.dev0',
+    version='6.7.2',
     f_globals=globals(),
     msg="The pyomo_constant_types set will be removed in the future: the set "
     "contained only NumericConstant and _PythonCallbackFunctionID, and provided "

pyomo/gdp/disjunct.py

@@ -450,7 +450,7 @@ def _activate_without_unfixing_indicator(self):
 
 class _DisjunctData(metaclass=RenamedClass):
     __renamed__new_class__ = DisjunctData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 @ModelComponentFactory.register("Disjunctive blocks.")
@@ -627,7 +627,7 @@ def set_value(self, expr):
 
 class _DisjunctionData(metaclass=RenamedClass):
     __renamed__new_class__ = DisjunctionData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 @ModelComponentFactory.register("Disjunction expressions.")

pyomo/mpec/complementarity.py

@@ -181,7 +181,7 @@ def set_value(self, cc):
 
 class _ComplementarityData(metaclass=RenamedClass):
     __renamed__new_class__ = ComplementarityData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 @ModelComponentFactory.register("Complementarity conditions.")

pyomo/network/arc.py

@@ -248,7 +248,7 @@ def _validate_ports(self, source, destination, ports):
 
 class _ArcData(metaclass=RenamedClass):
     __renamed__new_class__ = ArcData
-    __renamed__version__ = '6.7.2.dev0'
+    __renamed__version__ = '6.7.2'
 
 
 @ModelComponentFactory.register("Component used for connecting two Ports.")