SimplHDL 0.7.2__tar.gz → 0.8.2__tar.gz

{simplhdl-0.7.2 → simplhdl-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SimplHDL
-Version: 0.7.2
+Version: 0.8.2
 Summary: A framework for simulating and implementing HDL designs
 Author-email: Rasmus Grøndahl Olsen <simplhdl@gmail.com>
 Maintainer-email: Rasmus Grøndahl Olsen <simplhdl@gmail.com>

{simplhdl-0.7.2 → simplhdl-0.8.2}/pyproject.toml

@@ -1,12 +1,23 @@
 [build-system]
 requires = [
-    "setuptools>=60",
-    "setuptools-scm>=8.0"]
+    "setuptools>=64.0",
+    "wheel"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools.dynamic]
 version = {attr = "simplhdl.__version__"}
 
+[tool.setuptools.package-data]
+"*" = ["*.j2"]
+
+[tool.flake8]
+max-line-length = 120
+max_complexity = 10
+per-file-ignores = [
+    # Ignore the F401 (unused import) error in all __init__.py files
+    "__init__.py:F401",
+]
+
 [project]
 name = "SimplHDL"
 description = "A framework for simulating and implementing HDL designs"
@@ -62,3 +73,23 @@ Homepage = "https://github.com/SimplHDL"
 Documentation = "https://simplhdl.readthedocs.io/en/latest/"
 Repository = "https://github.com/SimplHDL/simplhdl.git"
 Issues = "https://github.com/SimplHDL/simplhdl/issues"
+
+
+[project.entry-points."simplhdl.plugins"]
+chisel_generator = "simplhdl_chisel.chisel:ChiselGenerator"
+encrypt_flow = "simplhdl_encrypt.encrypt.encryptflow:EncryptFlow"
+fusersoc_parser = "simplhdl_fusesocparser.fusesocparser:FuseSocParser"
+lint_flow = "simplhdl_lint.lint.lintflow:LintFlow"
+modelsim = "simplhdl_modelsim.modelsim.modelsimflow:ModelSimFlow"
+peakrdl_generator = "simplhdl_peakrdl.systemrdl:PeakRdlGenerator"
+quartus = "simplhdl_quartus.quartusflow:QuartusFlow"
+quartus_generator = "simplhdl_quartus.spd:QuartusGenerator"
+quartus-dse = "simplhdl_quartus.quartusdse.quartusdseflow:QuartusDseFlow"
+quartus-export = "simplhdl_quartus.quartusexport.quartusexportflow:QuartusExportFlow"
+questasim = "simplhdl_questasim.questasim.questasimflow:QuestaSimFlow"
+rivierapro = "simplhdl_rivierapro.rivierapro.rivieraproflow:RivieraProFlow"
+simplhdl_parser = "simplhdl_parser.simplhdlparser:SimplHdlParser"
+vcs = "simplhdl_vcs.vcs.vcsflow:VcsFlow"
+vivado = "simplhdl_vivado.vivadoflow:VivadoFlow"
+vivado_generator = "simplhdl_vivado.ipxact:VivadoGenerator"
+xsim = "simplhdl_vivado.xsim.xsimflow:XsimFlow"

{simplhdl-0.7.2 → simplhdl-0.8.2}/src/SimplHDL.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SimplHDL
-Version: 0.7.2
+Version: 0.8.2
 Summary: A framework for simulating and implementing HDL designs
 Author-email: Rasmus Grøndahl Olsen <simplhdl@gmail.com>
 Maintainer-email: Rasmus Grøndahl Olsen <simplhdl@gmail.com>

simplhdl-0.8.2/src/SimplHDL.egg-info/SOURCES.txt

@@ -0,0 +1,141 @@
+LICENSE
+README.md
+pyproject.toml
+src/SimplHDL.egg-info/PKG-INFO
+src/SimplHDL.egg-info/SOURCES.txt
+src/SimplHDL.egg-info/dependency_links.txt
+src/SimplHDL.egg-info/entry_points.txt
+src/SimplHDL.egg-info/requires.txt
+src/SimplHDL.egg-info/top_level.txt
+src/simplhdl/__init__.py
+src/simplhdl/__main__.py
+src/simplhdl/cocotb.py
+src/simplhdl/simplhdl.py
+src/simplhdl/tools.py
+src/simplhdl/utils.py
+src/simplhdl/cli/info.py
+src/simplhdl/cli/run.py
+src/simplhdl/plugin/__init__.py
+src/simplhdl/plugin/flow.py
+src/simplhdl/plugin/generator.py
+src/simplhdl/plugin/implementationflow.py
+src/simplhdl/plugin/loader.py
+src/simplhdl/plugin/parser.py
+src/simplhdl/plugin/simulationflow.py
+src/simplhdl/pyedaa/__init__.py
+src/simplhdl/pyedaa/attributes.py
+src/simplhdl/pyedaa/design.py
+src/simplhdl/pyedaa/fileset.py
+src/simplhdl/pyedaa/filetypes.py
+src/simplhdl/pyedaa/project.py
+src/simplhdl/pyedaa/repo.py
+src/simplhdl/pyedaa/target.py
+src/simplhdl/pyedaa/vhdllibrary.py
+src/simplhdl_chisel/chisel.py
+src/simplhdl_encrypt/__init__.py
+src/simplhdl_encrypt/encrypt/__init__.py
+src/simplhdl_encrypt/encrypt/encryptflow.py
+src/simplhdl_fusesocparser/__init__.py
+src/simplhdl_fusesocparser/fusesocparser.py
+src/simplhdl_lint/__init__.py
+src/simplhdl_lint/flake8/flake8flow.py
+src/simplhdl_lint/lint/lintflow.py
+src/simplhdl_lint/resources/__init__.py
+src/simplhdl_lint/resources/templates/__init__.py
+src/simplhdl_lint/resources/templates/flake8/__init__.py
+src/simplhdl_lint/resources/templates/flake8/setup.cfg.j2
+src/simplhdl_lint/resources/templates/verible/__init__.py
+src/simplhdl_lint/resources/templates/verible/rules.cfg.j2
+src/simplhdl_lint/resources/templates/vsg/__init__.py
+src/simplhdl_lint/resources/templates/vsg/files.json.j2
+src/simplhdl_lint/resources/templates/vsg/rules.yml.j2
+src/simplhdl_lint/verible/__init__.py
+src/simplhdl_lint/verible/veribleflow.py
+src/simplhdl_lint/vsg/__init__.py
+src/simplhdl_lint/vsg/vsgflow.py
+src/simplhdl_modelsim/__init__.py
+src/simplhdl_modelsim/modelsim/__init__.py
+src/simplhdl_modelsim/modelsim/modelsimflow.py
+src/simplhdl_modelsim/resources/__init__.py
+src/simplhdl_modelsim/resources/templates/__init__.py
+src/simplhdl_modelsim/resources/templates/modelsim/Makefile.j2
+src/simplhdl_modelsim/resources/templates/modelsim/__init__.py
+src/simplhdl_modelsim/resources/templates/modelsim/cocotb.mk.j2
+src/simplhdl_modelsim/resources/templates/modelsim/dependencies.mk.j2
+src/simplhdl_modelsim/resources/templates/modelsim/files.j2
+src/simplhdl_modelsim/resources/templates/modelsim/fileset.j2
+src/simplhdl_modelsim/resources/templates/modelsim/modelsim.tcl.j2
+src/simplhdl_modelsim/resources/templates/modelsim/project.mk.j2
+src/simplhdl_modelsim/resources/templates/modelsim/run.do.j2
+src/simplhdl_parser/__init__.py
+src/simplhdl_parser/simplhdlparser.py
+src/simplhdl_peakrdl/__init__.py
+src/simplhdl_peakrdl/systemrdl.py
+src/simplhdl_quartus/quartusflow.py
+src/simplhdl_quartus/spd.py
+src/simplhdl_quartus/quartusdse/__init__.py
+src/simplhdl_quartus/quartusdse/quartusdseflow.py
+src/simplhdl_quartus/quartusexport/__init__.py
+src/simplhdl_quartus/quartusexport/quartusexportflow.py
+src/simplhdl_quartus/resources/__init__.py
+src/simplhdl_quartus/resources/templates/__init__.py
+src/simplhdl_quartus/resources/templates/quartus/__init__.py
+src/simplhdl_quartus/resources/templates/quartus/project.tcl.j2
+src/simplhdl_quartus/resources/templates/quartus/run.tcl.j2
+src/simplhdl_questasim/questasim/__init__.py
+src/simplhdl_questasim/questasim/questasimflow.py
+src/simplhdl_questasim/resources/__init__.py
+src/simplhdl_questasim/resources/templates/__init__.py
+src/simplhdl_questasim/resources/templates/questasim/__init__.py
+src/simplhdl_questasim/resources/templates/questasim/modelsim.tcl.j2
+src/simplhdl_questasim/resources/templates/questasim/project.qrun.j2
+src/simplhdl_questasim/resources/templates/questasim/visualizer.tcl.j2
+src/simplhdl_questasim/resources/templates/questasim/vsim-run.do.j2
+src/simplhdl_rivierapro/__init__.py
+src/simplhdl_rivierapro/resources/__init__.py
+src/simplhdl_rivierapro/resources/templates/__init__.py
+src/simplhdl_rivierapro/resources/templates/rivierapro/Makefile.j2
+src/simplhdl_rivierapro/resources/templates/rivierapro/__init__.py
+src/simplhdl_rivierapro/resources/templates/rivierapro/cocotb.mk.j2
+src/simplhdl_rivierapro/resources/templates/rivierapro/dependencies.mk.j2
+src/simplhdl_rivierapro/resources/templates/rivierapro/files.j2
+src/simplhdl_rivierapro/resources/templates/rivierapro/fileset.j2
+src/simplhdl_rivierapro/resources/templates/rivierapro/project.mk.j2
+src/simplhdl_rivierapro/rivierapro/__init__.py
+src/simplhdl_rivierapro/rivierapro/rivieraproflow.py
+src/simplhdl_vcs/__init__.py
+src/simplhdl_vcs/resources/__init__.py
+src/simplhdl_vcs/resources/templates/__init__.py
+src/simplhdl_vcs/resources/templates/vcs/Makefile.j2
+src/simplhdl_vcs/resources/templates/vcs/__init__.py
+src/simplhdl_vcs/resources/templates/vcs/cocotb.mk.j2
+src/simplhdl_vcs/resources/templates/vcs/dependencies.mk.j2
+src/simplhdl_vcs/resources/templates/vcs/files.j2
+src/simplhdl_vcs/resources/templates/vcs/fileset.j2
+src/simplhdl_vcs/resources/templates/vcs/pli.tab.j2
+src/simplhdl_vcs/resources/templates/vcs/project.mk.j2
+src/simplhdl_vcs/resources/templates/vcs/simv-run.do.j2
+src/simplhdl_vcs/resources/templates/vcs/synopsys_sim.setup.j2
+src/simplhdl_vcs/resources/templates/vcs/vcs.parameters.j2
+src/simplhdl_vcs/vcs/__init__.py
+src/simplhdl_vcs/vcs/vcsflow.py
+src/simplhdl_vivado/__init__.py
+src/simplhdl_vivado/ipxact.py
+src/simplhdl_vivado/vivadoflow.py
+src/simplhdl_vivado/resources/__init__.py
+src/simplhdl_vivado/resources/templates/__init__.py
+src/simplhdl_vivado/resources/templates/vivado/__init__.py
+src/simplhdl_vivado/resources/templates/vivado/launch_run.sh.j2
+src/simplhdl_vivado/resources/templates/vivado/project.tcl.j2
+src/simplhdl_vivado/resources/templates/vivado/run.tcl.j2
+src/simplhdl_vivado/resources/templates/vivado/steps.tcl.j2
+src/simplhdl_vivado/resources/templates/xsim/Makefile.j2
+src/simplhdl_vivado/resources/templates/xsim/__init__.py
+src/simplhdl_vivado/resources/templates/xsim/cocotb.mk.j2
+src/simplhdl_vivado/resources/templates/xsim/dependencies.mk.j2
+src/simplhdl_vivado/resources/templates/xsim/files.j2
+src/simplhdl_vivado/resources/templates/xsim/fileset.j2
+src/simplhdl_vivado/resources/templates/xsim/project.mk.j2
+src/simplhdl_vivado/xsim/__init__.py
+src/simplhdl_vivado/xsim/xsimflow.py
+tests/test_dummy.py

simplhdl-0.8.2/src/SimplHDL.egg-info/entry_points.txt

@@ -0,0 +1,21 @@
+[console_scripts]
+simpl = simplhdl.__main__:main
+
+[simplhdl.plugins]
+chisel_generator = simplhdl_chisel.chisel:ChiselGenerator
+encrypt_flow = simplhdl_encrypt.encrypt.encryptflow:EncryptFlow
+fusersoc_parser = simplhdl_fusesocparser.fusesocparser:FuseSocParser
+lint_flow = simplhdl_lint.lint.lintflow:LintFlow
+modelsim = simplhdl_modelsim.modelsim.modelsimflow:ModelSimFlow
+peakrdl_generator = simplhdl_peakrdl.systemrdl:PeakRdlGenerator
+quartus = simplhdl_quartus.quartusflow:QuartusFlow
+quartus-dse = simplhdl_quartus.quartusdse.quartusdseflow:QuartusDseFlow
+quartus-export = simplhdl_quartus.quartusexport.quartusexportflow:QuartusExportFlow
+quartus_generator = simplhdl_quartus.spd:QuartusGenerator
+questasim = simplhdl_questasim.questasim.questasimflow:QuestaSimFlow
+rivierapro = simplhdl_rivierapro.rivierapro.rivieraproflow:RivieraProFlow
+simplhdl_parser = simplhdl_parser.simplhdlparser:SimplHdlParser
+vcs = simplhdl_vcs.vcs.vcsflow:VcsFlow
+vivado = simplhdl_vivado.vivadoflow:VivadoFlow
+vivado_generator = simplhdl_vivado.ipxact:VivadoGenerator
+xsim = simplhdl_vivado.xsim.xsimflow:XsimFlow

simplhdl-0.8.2/src/SimplHDL.egg-info/top_level.txt

@@ -0,0 +1,13 @@
+simplhdl
+simplhdl_chisel
+simplhdl_encrypt
+simplhdl_fusesocparser
+simplhdl_lint
+simplhdl_modelsim
+simplhdl_parser
+simplhdl_peakrdl
+simplhdl_quartus
+simplhdl_questasim
+simplhdl_rivierapro
+simplhdl_vcs
+simplhdl_vivado

simplhdl-0.8.2/src/simplhdl/__init__.py

@@ -0,0 +1,5 @@
+__version__ = "0.8.2"
+
+from .pyedaa.project import Project
+from .pyedaa.fileset import FileSet
+from .pyedaa.design import Design

{simplhdl-0.7.2 → simplhdl-0.8.2}/src/simplhdl/__main__.py

@@ -1,19 +1,19 @@
-import sys
 import argparse
-import argcomplete
 import logging
+import sys
 import traceback
-
-from typing import Sequence
 from pathlib import Path
+from typing import Sequence
+
+import argcomplete
 from rich.logging import RichHandler
 
 from . import __version__
+from .plugin.flow import FlowError, FlowFactory
+from .plugin.generator import GeneratorError
+from .plugin.loader import load_plugins
+from .plugin.parser import ParserError
 from .simplhdl import Simplhdl
-from .plugins import load_plugins
-from .flow import FlowFactory, FlowError
-from .generator import GeneratorError
-from .parser import ParserError
 from .utils import CalledShError
 
 logger = logging.getLogger(__name__)

{simplhdl-0.7.2/src/simplhdl → simplhdl-0.8.2/src/simplhdl/cli}/info.py

@@ -1,16 +1,16 @@
 from argparse import Namespace
 from pathlib import Path
+
 from rich.console import Console
-from rich.tree import Tree
 from rich.style import Style
+from rich.tree import Tree
 
-from simplhdl.pyedaa.project import Project
-from .flow import FlowBase, FlowFactory
-from .pyedaa.attributes import UsedIn
-from .pyedaa.fileset import FileSet
+from ..plugin.flow import FlowBase
+from ..pyedaa.attributes import UsedIn
+from ..pyedaa.fileset import FileSet
+from ..pyedaa.project import Project
 
 
-@FlowFactory.register('info')
 class Info(FlowBase):
 
     def __init__(self, name, args: Namespace, project: Project, builddir: Path):

{simplhdl-0.7.2/src/simplhdl → simplhdl-0.8.2/src/simplhdl/cli}/run.py

@@ -1,10 +1,9 @@
 from pprint import pprint
-from simplhdl.simplhdl import Simplhdl
-from simplhdl.flow import FlowBase, FlowFactory, FlowError
-from simplhdl.utils import chdir
+from ..simplhdl import Simplhdl
+from ..plugin.flow import FlowBase, FlowError
+from ..utils import chdir
 
 
-@FlowFactory.register('run')
 class Run(FlowBase):
 
     @classmethod

{simplhdl-0.7.2 → simplhdl-0.8.2}/src/simplhdl/cocotb.py

@@ -1,16 +1,22 @@
 import logging
-import re
 import os
-
-from packaging.version import Version
+import re
 from importlib.metadata import version
 from pathlib import Path
-from typing import Optional, Dict
+from typing import Dict, Optional
 
-from .utils import sh
+from packaging.version import Version
+
+from .plugin.flow import FlowError
+from .pyedaa import (
+    CocotbPythonFile,
+    SystemVerilogSourceFile,
+    VerilogIncludeFile,
+    VerilogSourceFile,
+    VHDLSourceFile,
+)
 from .pyedaa.project import Project
-from .pyedaa import VerilogIncludeFile, VerilogSourceFile, SystemVerilogSourceFile, VHDLSourceFile, CocotbPythonFile
-from .flow import FlowError
+from .utils import sh
 
 logger = logging.getLogger(__name__)
 

simplhdl-0.8.2/src/simplhdl/plugin/__init__.py

@@ -0,0 +1,5 @@
+from .parser import ParserBase, ParserError
+from .generator import GeneratorBase, GeneratorError
+from .flow import FlowBase, FlowError, FlowCategory, FlowTools
+from .simulationflow import SimulationFlow
+from .implementationflow import ImplementationFlow

{simplhdl-0.7.2/src/simplhdl → simplhdl-0.8.2/src/simplhdl/plugin}/flow.py

@@ -2,11 +2,11 @@ import logging
 
 from argparse import Namespace
 from pathlib import Path
-from typing import Callable, Dict, Set
+from typing import Dict, Set
 from abc import ABCMeta, abstractmethod
 from enum import Flag, auto
 
-from .pyedaa.project import Project
+from ..pyedaa.project import Project
 
 
 class FlowBase(metaclass=ABCMeta):
@@ -69,15 +69,10 @@ class FlowFactory:
     registry: Dict[str, FlowBase] = dict()
 
     @classmethod
-    def register(cls, name: str) -> Callable:
-
-        def inner_wrapper(wrapped_class: FlowBase) -> 'FlowBase':
-            if name in cls.registry:
-                raise Exception(f"Flow {name} already exists.")
-            cls.registry[name] = wrapped_class
-            return wrapped_class
-
-        return inner_wrapper
+    def register(cls, name: str, _class: FlowBase) -> None:
+        if name in cls.registry:
+            raise Exception(f"Flow {name} already exists.")
+        cls.registry[name] = _class
 
     @classmethod
     def get_flow(cls, name: str, args: Namespace, project: Project, builddir: Path) -> 'FlowBase':

{simplhdl-0.7.2/src/simplhdl → simplhdl-0.8.2/src/simplhdl/plugin}/generator.py

@@ -1,9 +1,9 @@
 from argparse import Namespace
 from pathlib import Path
-from typing import Callable, Dict, Generator
+from typing import Dict, Generator
 from abc import ABCMeta, abstractmethod
 
-from .pyedaa.project import Project
+from ..pyedaa.project import Project
 from .flow import FlowCategory
 
 
@@ -38,15 +38,10 @@ class GeneratorFactory:
     registry: Dict[str, GeneratorBase] = dict()
 
     @classmethod
-    def register(cls, name: str) -> Callable:
-
-        def inner_wrapper(wrapped_class: GeneratorBase) -> 'GeneratorBase':
-            if name in cls.registry:
-                raise Exception(f"Generator {name} already exists.")
-            cls.registry[name] = wrapped_class
-            return wrapped_class
-
-        return inner_wrapper
+    def register(cls, name: str, _class: GeneratorBase) -> None:
+        if name in cls.registry:
+            raise Exception(f"Generator {name} already exists.")
+        cls.registry[name] = _class
 
     @classmethod
     def get_generator(

{simplhdl-0.7.2/src/simplhdl/flows → simplhdl-0.8.2/src/simplhdl/plugin}/implementationflow.py

@@ -3,8 +3,8 @@ import logging
 from argparse import Namespace
 from pathlib import Path
 
-from simplhdl.flow import FlowBase, FlowCategory
-from simplhdl.pyedaa.project import Project
+from .flow import FlowBase, FlowCategory
+from ..pyedaa.project import Project
 
 logger = logging.getLogger(__name__)
 

simplhdl-0.8.2/src/simplhdl/plugin/loader.py

@@ -0,0 +1,81 @@
+import logging
+
+try:
+    from importlib.metadata import EntryPoint, entry_points
+except ImportError:
+    from importlib_metadata import EntryPoint, entry_points
+
+from typing import Iterator
+
+from ..cli.info import Info
+from ..cli.run import Run
+from .flow import FlowBase, FlowFactory
+from .generator import GeneratorBase, GeneratorFactory
+from .parser import ParserBase, ParserFactory
+
+logger = logging.getLogger(__name__)
+
+
+def get_external_plugins(group_name: str) -> Iterator[EntryPoint]:
+    """
+    Retrieves all EntryPoint objects registered under a specific group name.
+
+    Args:
+        group_name: The string identifying the entry point group
+                    (e.g., 'simplhdl.plugins').
+
+    Returns:
+        An iterator of EntryPoint objects.
+    """
+    try:
+        # Use importlib.metadata to find registered entry points
+        plugins = entry_points(group=group_name)
+    except TypeError:
+        # Fallback for older versions of Python that might not support the 'group' argument
+        # This requires iterating through all entry points and filtering manually.
+        all_entries = entry_points()
+        # Note: entry_points() returns a dictionary-like object in Python < 3.10
+        plugins = all_entries.get(group_name, [])
+
+    return plugins
+
+
+def load_external_plugins() -> None:
+    """
+    Loads external plugins.
+    """
+    for plugin in get_external_plugins("simplhdl.plugins"):
+
+        try:
+            # 1. Load the class/function explicitly
+            PluginClass = plugin.load()
+
+            # 2. Check if the class inherits from the expected base (GeneratorBase)
+            # You might need to import GeneratorBase here for the check.
+            if not issubclass(PluginClass, (ParserBase, GeneratorBase, FlowBase)):
+                logger.warning(f"Plugin {plugin.name} is not a valid ParserBase, GeneratorBase, FlowBase.")
+                continue
+
+            if issubclass(PluginClass, ParserBase):
+                ParserFactory.register(plugin.name, PluginClass)
+                logger.debug(f"Registered external parser: {plugin.name}")
+
+            if issubclass(PluginClass, GeneratorBase):
+                GeneratorFactory.register(plugin.name, PluginClass)
+                logger.debug(f"Registered external generator: {plugin.name}")
+
+            if issubclass(PluginClass, FlowBase):
+                FlowFactory.register(plugin.name, PluginClass)
+                logger.debug(f"Registered external flow: {plugin.name}")
+
+        except Exception as e:
+            logger.error(f"Failed to load or register plugin {plugin.name}: {e}")
+
+
+def load_plugins() -> None:
+    """
+    Loads all plugins, both builtin and external.
+    """
+    FlowFactory.register('info', Info)
+    FlowFactory.register('run', Run)
+    load_external_plugins()

{simplhdl-0.7.2/src/simplhdl → simplhdl-0.8.2/src/simplhdl/plugin}/parser.py

@@ -1,12 +1,13 @@
+from __future__ import annotations
+
 import logging
 
 from pathlib import Path
-from typing import Callable
 from abc import ABCMeta, abstractmethod
 from argparse import Namespace
 
-from .pyedaa.fileset import FileSet
-from .pyedaa.project import Project
+from ..pyedaa.fileset import FileSet
+from ..pyedaa.project import Project
 
 logger = logging.getLogger(__name__)
 
@@ -21,7 +22,7 @@ class ParserBase(metaclass=ABCMeta):
         pass
 
     @abstractmethod
-    def parse(self, filename: Path, project: Project, args: Namespace) -> 'FileSet':
+    def parse(self, filename: Path, project: Project, args: Namespace) -> FileSet:
         pass
 
 
@@ -32,7 +33,7 @@ class NoParser(ParserBase):
     def is_valid_format(self, filename: Path) -> bool:
         return True
 
-    def parse(self, filename: Path, project: Project, args: Namespace) -> 'FileSet':
+    def parse(self, filename: Path, project: Project, args: Namespace) -> FileSet:
         return FileSet('Empty')
 
 
@@ -44,19 +45,13 @@ class ParserFactory:
     registry: dict = {}
 
     @classmethod
-    def register(cls) -> Callable:
-
-        def inner_wrapper(wrapped_class: ParserBase) -> 'ParserBase':
-            name = wrapped_class.__name__  # type: ignore
-            if name in cls.registry:
-                raise Exception(f"Parser {name} already exists.")
-            cls.registry[name] = wrapped_class
-            return wrapped_class
-
-        return inner_wrapper
+    def register(cls, name: str, _class: ParserBase) -> None:
+        if name in cls.registry:
+            raise Exception(f"Parser {name} already exists.")
+        cls.registry[name] = _class
 
     @classmethod
-    def get_parser(cls, filename: Path) -> 'ParserBase':
+    def get_parser(cls, filename: Path) -> ParserBase:
         for parser_class in cls.registry.values():
             parser = parser_class()
             if parser.is_valid_format(filename):

{simplhdl-0.7.2/src/simplhdl/flows → simplhdl-0.8.2/src/simplhdl/plugin}/simulationflow.py

@@ -2,25 +2,35 @@ try:
     from importlib.resources import files as resources_files
 except ImportError:
     from importlib_resources import files as resources_files
-import os
 import logging
+import os
 import shutil
-
-from typing import Callable, Generator, List, Dict, Tuple, Any
-from jinja2 import Environment, FileSystemLoader
 from argparse import Namespace
 from pathlib import Path
+from typing import Any, Callable, Dict, Generator, List, Tuple
 
-from simplhdl.flow import FlowBase, FlowCategory, FlowError
-from simplhdl.pyedaa.project import Project
-from simplhdl.pyedaa.attributes import UsedIn
-from simplhdl.cocotb import Cocotb
-from simplhdl.pyedaa.fileset import FileSet
-from simplhdl.pyedaa import (
-    File, VerilogSourceFile, VerilogIncludeFile, SystemVerilogSourceFile, VHDLSourceFile,
-    MemoryInitFile
+from jinja2 import Environment, FileSystemLoader
+
+from ..cocotb import Cocotb
+from ..pyedaa import (
+    File,
+    MemoryInitFile,
+    SystemVerilogSourceFile,
+    VerilogIncludeFile,
+    VerilogSourceFile,
+    VHDLSourceFile,
+)
+from ..pyedaa.attributes import UsedIn
+from ..pyedaa.fileset import FileSet
+from ..pyedaa.project import Project
+from ..utils import (
+    append_suffix,
+    generate_from_template,
+    md5check,
+    md5sum,
+    md5write,
 )
-from simplhdl.utils import generate_from_template, md5sum, md5check, md5write, append_suffix
+from .flow import FlowBase, FlowCategory, FlowError
 
 logger = logging.getLogger(__name__)
 

{simplhdl-0.7.2 → simplhdl-0.8.2}/src/simplhdl/pyedaa/project.py

@@ -3,7 +3,7 @@ import pyEDAA.ProjectModel as pm  # type: ignore
 
 from typing import Dict, List, Optional
 from pathlib import Path
-from ..repo import Repo
+from .repo import Repo
 from .design import Design
 from .target import Target
 from . import (

{simplhdl-0.7.2/src/simplhdl → simplhdl-0.8.2/src/simplhdl/pyedaa}/repo.py

@@ -4,7 +4,7 @@ from abc import ABCMeta, abstractmethod
 from typing import Optional
 from pathlib import Path
 
-from .utils import sh, lock
+from ..utils import sh, lock
 
 
 class Repo(metaclass=ABCMeta):

{simplhdl-0.7.2 → simplhdl-0.8.2}/src/simplhdl/simplhdl.py

@@ -6,9 +6,9 @@ from argparse import Namespace
 from .pyedaa.project import Project
 from .pyedaa.design import Design
 from .pyedaa.vhdllibrary import VHDLLibrary
-from .parser import ParserFactory
-from .flow import FlowFactory
-from .generator import GeneratorFactory
+from .plugin.parser import ParserFactory
+from .plugin.flow import FlowFactory
+from .plugin.generator import GeneratorFactory
 
 logger = logging.getLogger(__name__)