MOre codestyle.

Author: shyuep

fireworks/core/firework.py

@@ -4,7 +4,6 @@
 
 from copy import deepcopy
 
-
 """
 This module contains some of the most central FireWorks classes:
 
@@ -67,7 +66,9 @@ def __init__(self, *args, **kwargs):
             allowed_params = required_params + self.optional_params
             for k in kwargs:
                 if k not in allowed_params:
-                    raise RuntimeError("Invalid keyword argument specified for: {}. You specified: {}. Allowed values are: {}.".format(self.__class__, k, allowed_params))
+                    raise RuntimeError(
+                        "Invalid keyword argument specified for: {}. You specified: {}. Allowed values are: {}.".format(
+                            self.__class__, k, allowed_params))
 
     @abc.abstractmethod
     def run_task(self, fw_spec):
@@ -195,7 +196,7 @@ class Firework(FWSerializable):
     A Firework is a workflow step and might be contain several Firetasks.
     """
 
-    STATE_RANKS = {'ARCHIVED': -2, 'FIZZLED': -1, 'DEFUSED': 0, 'PAUSED' : 0,
+    STATE_RANKS = {'ARCHIVED': -2, 'FIZZLED': -1, 'DEFUSED': 0, 'PAUSED': 0,
                    'WAITING': 1, 'READY': 2, 'RESERVED': 3, 'RUNNING': 4,
                    'COMPLETED': 5}
 
@@ -290,7 +291,7 @@ def _rerun(self):
         if self.state == 'FIZZLED':
             last_launch = self.launches[-1]
             if (EXCEPT_DETAILS_ON_RERUN and last_launch.action and
-                last_launch.action.stored_data.get('_exception', {}).get('_details')):
+                    last_launch.action.stored_data.get('_exception', {}).get('_details')):
                 # add the exception details to the spec
                 self.spec['_exception_details'] = last_launch.action.stored_data['_exception']['_details']
             else:
@@ -688,7 +689,7 @@ def __reduce__(self):
             arguments
             """
             state = list(self.items())
-            return NestedClassGetter(), (Workflow, self.__class__.__name__, ), state
+            return NestedClassGetter(), (Workflow, self.__class__.__name__,), state
 
     def __init__(self, fireworks, links_dict=None, name=None, metadata=None, created_on=None,
                  updated_on=None, fw_states=None):
@@ -763,7 +764,7 @@ def state(self):
             state (str): state of workflow
         """
         m_state = 'READY'
-        #states = [fw.state for fw in self.fws]
+        # states = [fw.state for fw in self.fws]
         states = self.fw_states.values()
         leaf_fw_ids = self.leaf_fw_ids  # to save recalculating this
 
@@ -782,9 +783,9 @@ def state(self):
             for fizzled_id in fizzled_ids:
                 # If a fizzled fw is a leaf fw, then the workflow is fizzled
                 if (fizzled_id in leaf_fw_ids or
-                    # Otherwise all children must be ok with the fizzled parent
-                    not all(self.id_fw[child_id].spec.get('_allow_fizzled_parents', False)
-                            for child_id in self.links[fizzled_id])):
+                        # Otherwise all children must be ok with the fizzled parent
+                        not all(self.id_fw[child_id].spec.get('_allow_fizzled_parents', False)
+                                for child_id in self.links[fizzled_id])):
                     m_state = 'FIZZLED'
                     break
             else:

fireworks/core/rocket.py

@@ -192,15 +192,15 @@ def run(self, pdb_on_exception=False):
                 all_mod_spec.extend(recovery.get('_all_mod_spec'))
                 if lp:
                     l_logger.log(
-                                logging.INFO,
-                                'Recovering from task number {} in folder {}.'.format(starting_task,
-                                                                                      recovery_dir))
+                        logging.INFO,
+                        'Recovering from task number {} in folder {}.'.format(starting_task,
+                                                                              recovery_dir))
                 if recovery_mode == 'cp' and launch_dir != recovery_dir:
                     if lp:
                         l_logger.log(
-                                    logging.INFO,
-                                    'Copying data from recovery folder {} to folder {}.'.format(recovery_dir,
-                                                                                                launch_dir))
+                            logging.INFO,
+                            'Copying data from recovery folder {} to folder {}.'.format(recovery_dir,
+                                                                                        launch_dir))
                     distutils.dir_util.copy_tree(recovery_dir, launch_dir, update=1)
 
             else:
@@ -215,7 +215,7 @@ def run(self, pdb_on_exception=False):
                         shutil.copyfileobj(fin, fout)
 
             if lp:
-                message = 'RUNNING fw_id: {} in directory: {}'.\
+                message = 'RUNNING fw_id: {} in directory: {}'. \
                     format(m_fw.fw_id, os.getcwd())
                 l_logger.log(logging.INFO, message)
 
@@ -245,7 +245,7 @@ def run(self, pdb_on_exception=False):
                 Rocket.update_checkpoint(lp, launch_dir, launch_id, checkpoint)
 
                 if lp:
-                   l_logger.log(logging.INFO, "Task started: %s." % t.fw_name)
+                    l_logger.log(logging.INFO, "Task started: %s." % t.fw_name)
 
                 if my_spec.get("_add_launchpad_and_fw_id"):
                     t.fw_id = m_fw.fw_id
@@ -275,7 +275,7 @@ def run(self, pdb_on_exception=False):
                     except BaseException as e:
                         if lp:
                             l_logger.log(logging.WARNING,
-                                        "Exception couldn't be serialized: %s " % e)
+                                         "Exception couldn't be serialized: %s " % e)
                         exception_details = None
 
                     try:
@@ -371,10 +371,10 @@ def run(self, pdb_on_exception=False):
         except LockedWorkflowError as e:
             l_logger.log(logging.DEBUG, traceback.format_exc())
             l_logger.log(logging.WARNING,
-                           "Firework {} reached final state {} but couldn't complete the update of "
-                           "the database. Reason: {}\nRefresh the WF to recover the result "
-                           "(lpad admin refresh -i {}).".format(
-                               self.fw_id, final_state, e, self.fw_id))
+                         "Firework {} reached final state {} but couldn't complete the update of "
+                         "the database. Reason: {}\nRefresh the WF to recover the result "
+                         "(lpad admin refresh -i {}).".format(
+                             self.fw_id, final_state, e, self.fw_id))
             return True
 
         except Exception:
@@ -403,10 +403,10 @@ def run(self, pdb_on_exception=False):
                 except LockedWorkflowError as e:
                     l_logger.log(logging.DEBUG, traceback.format_exc())
                     l_logger.log(logging.WARNING,
-                                   "Firework {} fizzled but couldn't complete the update of the database."
-                                   " Reason: {}\nRefresh the WF to recover the result "
-                                   "(lpad admin refresh -i {}).".format(
-                                       self.fw_id, final_state, e, self.fw_id))
+                                 "Firework {} fizzled but couldn't complete the update of the database."
+                                 " Reason: {}\nRefresh the WF to recover the result "
+                                 "(lpad admin refresh -i {}).".format(
+                                     self.fw_id, final_state, e, self.fw_id))
                     return True
             else:
                 fpath = zpath("FW_offline.json")
@@ -445,7 +445,7 @@ def decorate_fwaction(self, fwaction, my_spec, m_fw, launch_dir):
 
         if my_spec.get("_pass_job_info"):
             job_info = list(my_spec.get("_job_info", []))
-            this_job_info = {"fw_id": m_fw.fw_id, "name": m_fw.name, "launch_dir": launch_dir, "state":m_fw.state}
+            this_job_info = {"fw_id": m_fw.fw_id, "name": m_fw.name, "launch_dir": launch_dir, "state": m_fw.state}
             if this_job_info not in job_info:
                 job_info.append(this_job_info)
             fwaction.mod_spec.append({"_push_all": {"_job_info": job_info}})
@@ -463,9 +463,9 @@ def decorate_fwaction(self, fwaction, my_spec, m_fw, launch_dir):
                 files = glob.glob(os.path.join(launch_dir, v))
                 if files:
                     filepath = sorted(files)[-1]
-                    fwaction.mod_spec.append( {
-                      "_set": {"_files_prev->{:s}".format(k): filepath }
-                    } )
+                    fwaction.mod_spec.append({
+                        "_set": {"_files_prev->{:s}".format(k): filepath}
+                    })
         elif "_files_prev" in my_spec:
             # This ensures that _files_prev are not passed from Firework to
             # Firework. We do not want output files from fw1 to be used by fw3

fireworks/examples/custom_firetasks/hello_world/hello_world_run.py

@@ -13,4 +13,4 @@
     lp.add_wf(my_wflow)
 
     # run the workflow
-    launch_rocket(lp)
+    launch_rocket(lp)

fireworks/examples/custom_firetasks/hello_world/hello_world_task.py

@@ -5,4 +5,4 @@
 class HelloTask(FiretaskBase):
 
     def run_task(self, fw_spec):
-        print("Hello, world!")
+        print("Hello, world!")

fireworks/examples/custom_firetasks/merge_task/merge_task.py

@@ -7,6 +7,7 @@
 A workflow where 2 parent Fireworks (A and B) merge into a common child C.
 """
 
+
 @explicit_serialize
 class TaskA(FiretaskBase):
 
@@ -22,6 +23,7 @@ def run_task(self, fw_spec):
         print("This is task B")
         return FWAction(update_spec={"param_B": 20})
 
+
 @explicit_serialize
 class TaskC(FiretaskBase):
 
@@ -30,6 +32,7 @@ def run_task(self, fw_spec):
         print("Task A gave me: {}".format(fw_spec["param_A"]))
         print("Task B gave me: {}".format(fw_spec["param_B"]))
 
+
 if __name__ == "__main__":
     # set up the LaunchPad and reset it
     launchpad = LaunchPad()
@@ -44,4 +47,4 @@ def run_task(self, fw_spec):
 
     # store workflow and launch it locally
     launchpad.add_wf(workflow)
-    rapidfire(launchpad)
+    rapidfire(launchpad)

fireworks/examples/tutorial_examples/dynamic_wf1.py

@@ -1,5 +1,6 @@
 """
-This code is described in the Dynamic Workflow tutorial, https://materialsproject.github.io/fireworks/dynamic_wf_tutorial.html
+This code is described in the Dynamic Workflow tutorial,
+https://materialsproject.github.io/fireworks/dynamic_wf_tutorial.html
 """
 
 from fireworks import ScriptTask

fireworks/examples/tutorial_examples/dynamic_wf2.py

@@ -1,5 +1,6 @@
 """
-This code is described in the Dynamic Workflow tutorial, https://materialsproject.github.io/fireworks/dynamic_wf_tutorial.html
+This code is described in the Dynamic Workflow tutorial,
+https://materialsproject.github.io/fireworks/dynamic_wf_tutorial.html
 """
 
 from fireworks import Firework, FWorker, LaunchPad
@@ -17,4 +18,3 @@
     # store workflow and launch it locally
     launchpad.add_wf(firework)
     rapidfire(launchpad, FWorker())
-

fireworks/examples/tutorial_examples/firetasks.py

@@ -1,5 +1,6 @@
 """
-This code is described in the Firetasks tutorial, https://materialsproject.github.io/fireworks/firetask_tutorial.html
+This code is described in the Firetasks tutorial,
+https://materialsproject.github.io/fireworks/firetask_tutorial.html
 """
 
 from fireworks import Firework, FWorker, LaunchPad
@@ -16,4 +17,4 @@
 
     # store workflow and launch it locally
     launchpad.add_wf(firework)
-    launch_rocket(launchpad, FWorker())
+    launch_rocket(launchpad, FWorker())

fireworks/examples/tutorial_examples/introduction.py

@@ -1,5 +1,6 @@
 """
-This code is described in the Introductory tutorial, https://materialsproject.github.io/fireworks/introduction.html
+This code is described in the Introductory tutorial,
+https://materialsproject.github.io/fireworks/introduction.html
 """
 
 from fireworks import Firework, LaunchPad, ScriptTask
@@ -16,4 +17,4 @@
 
     # store workflow and launch it locally
     launchpad.add_wf(firework)
-    launch_rocket(launchpad)
+    launch_rocket(launchpad)

fireworks/queue/__init__.py

@@ -3,4 +3,4 @@
 __version__ = '0.1'
 __maintainer__ = 'Anubhav Jain'
 __email__ = '[email protected]'
-__date__ = 'Feb 28, 2013'
+__date__ = 'Feb 28, 2013'

fireworks/queue/queue_launcher.py

@@ -228,7 +228,7 @@ def rapidfire(launchpad, fworker, qadapter, launch_dir='.', nlaunches=0, njobs_q
 
                 # launch a single job
                 return_code = launch_rocket_to_queue(launchpad, fworker, qadapter, block_dir, reserve,
-                                              strm_lvl, True, fill_mode)
+                                                     strm_lvl, True, fill_mode)
                 if return_code is None:
                     l_logger.info('No READY jobs detected...')
                     break

fireworks/scripts/qlaunch_run.py

@@ -13,6 +13,7 @@
 
 try:
     import fabric
+
     if int(fabric.__version__.split('.')[0]) < 2:
         raise ImportError
 except ImportError:
@@ -70,6 +71,7 @@ def do_launch(args):
         launch_rocket_to_queue(launchpad, fworker, queueadapter,
                                args.launch_dir, args.reserve, args.loglvl, False, args.fill_mode, args.fw_id)
 
+
 def qlaunch():
     m_description = 'This program is used to submit jobs to a queueing system. ' \
                     'Details of the job and queue interaction are handled by the ' \
@@ -149,8 +151,8 @@ def qlaunch():
     rapid_parser.add_argument('--timeout', help='timeout (secs) after which to quit (default None)',
                               default=None, type=int)
     rapid_parser.add_argument('--sleep', help='sleep time between loops', default=None, type=int)
-    
-    single_parser.add_argument('-f', '--fw_id', help='specific fw_id to run in reservation mode', 
+
+    single_parser.add_argument('-f', '--fw_id', help='specific fw_id to run in reservation mode',
                                default=None, type=int)
 
     try:

fireworks/utilities/filepad.py

@@ -20,7 +20,6 @@
 from fireworks.fw_config import LAUNCHPAD_LOC
 from fireworks.utilities.fw_utilities import get_fw_logger
 
-
 __author__ = 'Kiran Mathew'
 __email__ = '[email protected]'
 __credits__ = 'Anubhav Jain'
@@ -42,7 +41,8 @@ def __init__(self, host='localhost', port=27017, database='fireworks', username=
             gridfs_coll_name (str): gridfs collection name
             logdir (str): path to the log directory
             strm_lvl (str): the logger stream level
-            text_mode (bool): whether to use text_mode for file read/write (instead of binary). Might be useful if working only with text files between Windows and Unix systems
+            text_mode (bool): whether to use text_mode for file read/write (instead of binary). Might be useful if
+                working only with text files between Windows and Unix systems
         """
         self.host = host
         self.port = int(port)
@@ -159,7 +159,7 @@ def get_file_by_query(self, query, sort_key=None,
         if sort_key is None:
             cursor = self.filepad.find(query)
         else:
-            cursor = self.filepad.find(query).sort(sort_key,sort_direction)
+            cursor = self.filepad.find(query).sort(sort_key, sort_direction)
         for d in cursor:
             all_files.append(self._get_file_contents(d))
         return all_files

fireworks/utilities/update_collection.py

@@ -6,6 +6,7 @@
 __email__ = '[email protected], [email protected]'
 __date__ = 'Dec 08, 2016'
 
+
 def update_launchpad_data(lp, replacements, **kwargs):
     """
     If you want to update a text string in your entire FireWorks database with a replacement, use this method.

setup.cfg

@@ -12,7 +12,7 @@ release = register sdist upload
 
 [pycodestyle]
 count = True
-ignore=E121,E123,E126,E133,E226,E241,E242,E704,W503,W504,W505,E741,W605
+ignore=E121,E123,E126,E133,E226,E241,E242,E704,W503,W504,W505,E741,W605,E731
 max-line-length = 120
 statistics = True
 exclude=*test*,docs_rst/*.py,fireworks/__init__.py