Run black on changed files

Author: Eslick

Diff for: pyomo/solvers/plugins/solvers/ASL.py

@@ -27,11 +27,11 @@
 
 import logging
 
-logger = logging.getLogger('pyomo.solvers')
+logger = logging.getLogger("pyomo.solvers")
 
 
 @SolverFactory.register(
-    'asl', doc='Interface for solvers using the AMPL Solver Library'
+    "asl", doc="Interface for solvers using the AMPL Solver Library"
 )
 class ASL(SystemCallSolver):
     """A generic optimizer that uses the AMPL Solver Library to interface with applications."""
@@ -40,7 +40,7 @@ def __init__(self, **kwds):
         #
         # Call base constructor
         #
-        if not 'type' in kwds:
+        if not "type" in kwds:
             kwds["type"] = "asl"
         SystemCallSolver.__init__(self, **kwds)
         self._metasolver = True
@@ -93,7 +93,7 @@ def _get_version(self):
         """
         solver_exec = self.executable()
         if solver_exec is None:
-            return _extract_version('')
+            return _extract_version("")
         try:
             results = subprocess.run(
                 [solver_exec, "-v"],
@@ -105,8 +105,8 @@ def _get_version(self):
             ver = _extract_version(results.stdout)
             if ver is None:
                 # Some ASL solvers do not export a version number
-                if results.stdout.strip().split()[-1].startswith('ASL('):
-                    return '0.0.0'
+                if results.stdout.strip().split()[-1].startswith("ASL("):
+                    return "0.0.0"
             return ver
         except OSError:
             pass
@@ -139,9 +139,9 @@ def create_command_line(self, executable, problem_files):
                 "The 'soln_file' keyword will be ignored for solver=" + self.type
             )
         fname = problem_files[0]
-        if '.' in fname:
-            tmp = fname.split('.')
-            fname = '.'.join(tmp[:-1])
+        if "." in fname:
+            tmp = fname.split(".")
+            fname = ".".join(tmp[:-1])
         self._soln_file = fname + ".sol"
 
         #
@@ -158,15 +158,15 @@ def create_command_line(self, executable, problem_files):
         # Pyomo/Pyomo) with any user-specified external function
         # libraries
         #
-        if 'PYOMO_AMPLFUNC' in env:
-            if 'AMPLFUNC' in env:
-                for line in env['PYOMO_AMPLFUNC'].split('\n'):
-                    if line not in env['AMPLFUNC']:
-                        env['AMPLFUNC'] += "\n" + line
+        if "PYOMO_AMPLFUNC" in env:
+            if "AMPLFUNC" in env:
+                for line in env["PYOMO_AMPLFUNC"].split("\n"):
+                    if line not in env["AMPLFUNC"]:
+                        env["AMPLFUNC"] += "\n" + line
             else:
-                env['AMPLFUNC'] = env['PYOMO_AMPLFUNC']
+                env["AMPLFUNC"] = env["PYOMO_AMPLFUNC"]
 
-        cmd = [executable, problem_files[0], '-AMPL']
+        cmd = [executable, problem_files[0], "-AMPL"]
         if self._timer:
             cmd.insert(0, self._timer)
         #
@@ -181,12 +181,12 @@ def create_command_line(self, executable, problem_files):
         #
         opt = []
         for key in self.options:
-            if key == 'solver':
+            if key == "solver":
                 continue
-            if isinstance(self.options[key], str) and (' ' in self.options[key]):
-                opt.append(key + "=\"" + str(self.options[key]) + "\"")
+            if isinstance(self.options[key], str) and (" " in self.options[key]):
+                opt.append(key + '="' + str(self.options[key]) + '"')
                 cmd.append(str(key) + "=" + str(self.options[key]))
-            elif key == 'subsolver':
+            elif key == "subsolver":
                 opt.append("solver=" + str(self.options[key]))
                 cmd.append(str(key) + "=" + str(self.options[key]))
             else:
@@ -202,9 +202,9 @@ def create_command_line(self, executable, problem_files):
     def _presolve(self, *args, **kwds):
         if (not isinstance(args[0], str)) and (not isinstance(args[0], IBlock)):
             self._instance = args[0]
-            xfrm = TransformationFactory('mpec.nl')
+            xfrm = TransformationFactory("mpec.nl")
             xfrm.apply_to(self._instance)
-            if len(self._instance._transformation_data['mpec.nl'].compl_cuids) == 0:
+            if len(self._instance._transformation_data["mpec.nl"].compl_cuids) == 0:
                 # There were no complementarity conditions
                 # so we don't hold onto the instance
                 self._instance = None
@@ -223,7 +223,7 @@ def _postsolve(self):
         if not self._instance is None:
             from pyomo.mpec import Complementarity
 
-            for cuid in self._instance._transformation_data['mpec.nl'].compl_cuids:
+            for cuid in self._instance._transformation_data["mpec.nl"].compl_cuids:
                 mpec = True
                 cobj = cuid.find_component_on(self._instance)
                 cobj.parent_block().reclassify_component_type(cobj, Complementarity)
@@ -232,7 +232,7 @@ def _postsolve(self):
         return SystemCallSolver._postsolve(self)
 
 
-@SolverFactory.register('_mock_asl')
+@SolverFactory.register("_mock_asl")
 class MockASL(ASL, MockMIP):
     """A Mock ASL solver used for testing"""
 

Diff for: pyomo/solvers/plugins/solvers/IPOPT.py

@@ -23,10 +23,10 @@
 
 import logging
 
-logger = logging.getLogger('pyomo.solvers')
+logger = logging.getLogger("pyomo.solvers")
 
 
-@SolverFactory.register('ipopt', doc='The Ipopt NLP solver')
+@SolverFactory.register("ipopt", doc="The Ipopt NLP solver")
 class IPOPT(SystemCallSolver):
     """
     An interface to the Ipopt optimizer that uses the AMPL Solver Library.
@@ -76,7 +76,7 @@ def _get_version(self):
         """
         solver_exec = self.executable()
         if solver_exec is None:
-            return _extract_version('')
+            return _extract_version("")
         results = subprocess.run(
             [solver_exec, "-v"],
             timeout=self._version_timeout,
@@ -97,10 +97,10 @@ def create_command_line(self, executable, problem_files):
             self._log_file = TempfileManager.create_tempfile(suffix="_ipopt.log")
 
         fname = problem_files[0]
-        if '.' in fname:
-            tmp = fname.split('.')
+        if "." in fname:
+            tmp = fname.split(".")
             if len(tmp) > 2:
-                fname = '.'.join(tmp[:-1])
+                fname = ".".join(tmp[:-1])
             else:
                 fname = tmp[0]
         self._soln_file = fname + ".sol"
@@ -119,32 +119,32 @@ def create_command_line(self, executable, problem_files):
         # Pyomo/Pyomo) with any user-specified external function
         # libraries
         #
-        if 'PYOMO_AMPLFUNC' in env:
-            if 'AMPLFUNC' in env:
-                for line in env['PYOMO_AMPLFUNC'].split('\n'):
-                    if line not in env['AMPLFUNC']:
-                        env['AMPLFUNC'] += "\n" + line
+        if "PYOMO_AMPLFUNC" in env:
+            if "AMPLFUNC" in env:
+                for line in env["PYOMO_AMPLFUNC"].split("\n"):
+                    if line not in env["AMPLFUNC"]:
+                        env["AMPLFUNC"] += "\n" + line
             else:
-                env['AMPLFUNC'] = env['PYOMO_AMPLFUNC']
+                env["AMPLFUNC"] = env["PYOMO_AMPLFUNC"]
 
-        cmd = [executable, problem_files[0], '-AMPL']
+        cmd = [executable, problem_files[0], "-AMPL"]
         if self._timer:
             cmd.insert(0, self._timer)
 
         env_opt = []
         of_opt = []
         ofn_option_used = False
         for key in self.options:
-            if key == 'solver':
+            if key == "solver":
                 continue
             elif key.startswith("OF_"):
                 assert len(key) > 3
                 of_opt.append((key[3:], self.options[key]))
             else:
                 if key == "option_file_name":
                     ofn_option_used = True
-                if isinstance(self.options[key], str) and ' ' in self.options[key]:
-                    env_opt.append(key + "=\"" + str(self.options[key]) + "\"")
+                if isinstance(self.options[key], str) and " " in self.options[key]:
+                    env_opt.append(key + '="' + str(self.options[key]) + '"')
                     cmd.append(str(key) + "=" + str(self.options[key]))
                 else:
                     env_opt.append(key + "=" + str(self.options[key]))
@@ -167,7 +167,7 @@ def create_command_line(self, executable, problem_files):
             # Now check if an 'ipopt.opt' file exists in the
             # current working directory. If so, we need to
             # make it clear that this file will be ignored.
-            default_of_name = os.path.join(os.getcwd(), 'ipopt.opt')
+            default_of_name = os.path.join(os.getcwd(), "ipopt.opt")
             if os.path.exists(default_of_name):
                 logger.warning(
                     "A file named '%s' exists in "
@@ -187,7 +187,7 @@ def create_command_line(self, executable, problem_files):
             # Now set the command-line option telling Ipopt
             # to use this file
             env_opt.append('option_file_name="' + str(options_filename) + '"')
-            cmd.append('option_file_name=' + str(options_filename))
+            cmd.append("option_file_name=" + str(options_filename))
 
         envstr = "%s_options" % self.options.solver
         # Merge with any options coming in through the environment
@@ -206,6 +206,6 @@ def process_output(self, rc):
                 with open(self._log_file) as f:
                     for line in f:
                         if "TOO_FEW_DEGREES_OF_FREEDOM" in line:
-                            res.solver.message = line.split(':')[2].strip()
+                            res.solver.message = line.split(":")[2].strip()
                             assert "degrees of freedom" in res.solver.message
             return res