Merge branch 'main' into doc-config

Author: jsiirola

doc/OnlineDocs/explanation/contrib_index.txt

@@ -5,9 +5,5 @@ documentation for a description of these libraries.
 The 'example' directory illustrates the layout of a contrib package
 that is included in the Pyomo source tree.
 
-The 'simplemodel' directory illustrates the layout of a contrib
-package that is installed separately, but which appears as a
-subpackage under 'pyomo.contrib'.
-
 NOTE:  Packages that define plugins should be specified in 
 the file pyomo/pyomo/environ/__init__.py

pyomo/contrib/README.txt

@@ -8,18 +8,3 @@
 #  rights in this software.
 #  This software is distributed under the 3-clause BSD License.
 #  ___________________________________________________________________________
-
-#
-# declare deprecation paths for removed modules and attributes
-#
-from pyomo.common.deprecation import moved_module
-
-moved_module(
-    "pyomo.contrib.simplemodel",
-    "pyomocontrib_simplemodel",
-    msg="The use of pyomo.contrib.simplemodel is deprecated. "
-    "This capability is now supported in the pyomocontrib_simplemodel "
-    "package, which is included in the pyomo_community distribution.",
-    version='5.6.9',
-)
-del moved_module