Moved TOOLS and STEPS dictionaries inside the Factory and Project classes respectively

Author: rodrigomelo9

pyfpga/factory.py

@@ -18,24 +18,23 @@
 from pyfpga.vivado import Vivado
 
 
-TOOLS = {
-    'diamond': Diamond,
-    'ise': Ise,
-    'libero': Libero,
-    'openflow': Openflow,
-    'quartus': Quartus,
-    'vivado': Vivado
-}
-
-
 class Factory:
     """A factory class to create FPGA projects."""
 
+    TOOLS = {
+        'diamond': Diamond,
+        'ise': Ise,
+        'libero': Libero,
+        'openflow': Openflow,
+        'quartus': Quartus,
+        'vivado': Vivado
+    }
+
     def __init__(self, tool='vivado', project=None, odir='results'):
         """Class constructor."""
-        if tool not in TOOLS:
+        if tool not in Factory.TOOLS:
             raise NotImplementedError(f'{tool} is unsupported')
-        self._instance = TOOLS[tool](project, odir)
+        self._instance = Factory.TOOLS[tool](project, odir)
 
     def __getattr__(self, name):
         """Delegate attribute access to the tool instance."""

pyfpga/project.py

@@ -18,14 +18,6 @@
 from jinja2 import Environment, FileSystemLoader
 
 
-STEPS = {
-    'cfg': 'Project Creation',
-    'syn': 'Synthesis',
-    'par': 'Place and Route',
-    'bit': 'Bitstream generation'
-}
-
-
 class Project:
     """Base class to manage an FPGA project.
 
@@ -35,6 +27,13 @@ class Project:
     :type odir: str, optional
     """
 
+    STEPS = {
+        'cfg': 'Project Creation',
+        'syn': 'Synthesis',
+        'par': 'Place and Route',
+        'bit': 'Bitstream generation'
+    }
+
     def __init__(self, project=None, odir='results'):
         """Class constructor."""
         self.conf = {}
@@ -220,17 +219,17 @@ def make(self, first='cfg', last='bit'):
         .. note:: valid steps are ``cfg``, ``syn``, ``par`` and ``bit``.
         """
         self.logger.debug('Executing make')
-        if last not in STEPS:
+        if last not in Project.STEPS:
             raise ValueError('Invalid last step.')
-        if first not in STEPS:
+        if first not in Project.STEPS:
             raise ValueError('Invalid first step.')
-        keys = list(STEPS.keys())
+        keys = list(Project.STEPS.keys())
         index = [keys.index(first), keys.index(last)]
         if index[0] > index[1]:
             raise ValueError('Invalid steps combination.')
-        message = f'from {STEPS[first]} to {STEPS[last]}'
+        message = f'from {Project.STEPS[first]} to {Project.STEPS[last]}'
         if first == last:
-            message = STEPS[first]
+            message = Project.STEPS[first]
         self.logger.info('Running %s', message)
         self.data['steps'] = keys[index[0]:index[1]+1]
         self._make_custom()