Clean up automatic LegacySolverFactory registrations

Author: jsiirola

pyomo/contrib/solver/factory.py

@@ -27,7 +27,9 @@ def decorator(cls):
             class LegacySolver(LegacySolverWrapper, cls):
                 pass
 
-            LegacySolverFactory.register(legacy_name, doc)(LegacySolver)
+            LegacySolverFactory.register(legacy_name + " (new interface)", doc)(
+                LegacySolver
+            )
 
             return cls
 

pyomo/contrib/solver/ipopt.py

@@ -30,7 +30,6 @@
 from pyomo.repn.plugins.nl_writer import NLWriter, NLWriterInfo
 from pyomo.contrib.solver.base import SolverBase
 from pyomo.contrib.solver.config import SolverConfig
-from pyomo.contrib.solver.factory import SolverFactory
 from pyomo.contrib.solver.results import Results, TerminationCondition, SolutionStatus
 from pyomo.contrib.solver.sol_reader import parse_sol_file
 from pyomo.contrib.solver.solution import SolSolutionLoader
@@ -197,7 +196,6 @@ def get_reduced_costs(
 }
 
 
-@SolverFactory.register('ipopt_v2', doc='The ipopt NLP solver (new interface)')
 class Ipopt(SolverBase):
     CONFIG = IpoptConfig()
 

pyomo/contrib/solver/plugins.py

@@ -17,8 +17,8 @@
 
 def load():
     SolverFactory.register(
-        name='ipopt', legacy_name='ipopt_v2', doc='The IPOPT NLP solver (new interface)'
+        name='ipopt', legacy_name='ipopt_v2', doc='The IPOPT NLP solver'
     )(Ipopt)
     SolverFactory.register(
-        name='gurobi', legacy_name='gurobi_v2', doc='New interface to Gurobi'
+        name='gurobi', legacy_name='gurobi_v2', doc='Persistent interface to Gurobi'
     )(Gurobi)