Merge pull request #3553 from mrmundt/solver-dep-warn

Add `moved_module` deprecation for `contrib.solver` modules

Author: mrmundt

Diff for: pyomo/contrib/solver/__init__.py

@@ -8,3 +8,33 @@
 #  rights in this software.
 #  This software is distributed under the 3-clause BSD License.
 #  ___________________________________________________________________________
+
+from pyomo.common.deprecation import moved_module
+
+for _module in ('base', 'config', 'factory', 'results', 'util', 'persistent'):
+    moved_module(
+        f'pyomo.contrib.solver.{_module}',
+        f'pyomo.contrib.solver.common.{_module}',
+        version='6.9.2.dev0',
+    )
+
+moved_module(
+    'pyomo.contrib.solver.solution',
+    'pyomo.contrib.solver.common.solution_loader',
+    version='6.9.2.dev0',
+)
+
+for _module in ('ipopt', 'gurobi_direct', 'sol_reader'):
+    moved_module(
+        f'pyomo.contrib.solver.{_module}',
+        f'pyomo.contrib.solver.solvers.{_module}',
+        version='6.9.2.dev0',
+    )
+
+moved_module(
+    'pyomo.contrib.solver.gurobi',
+    'pyomo.contrib.solver.solvers.gurobi_persistent',
+    version='6.9.2.dev0',
+)
+
+del _module, moved_module