Make it possible to use locally installed yosys

 * Also bugfix test of module_with_error.v

CHANGELOG.md

@@ -1,6 +1,7 @@
 # CHANGELOG
 
 ## vx.x.x
+ - Make it possible to use locally installed yosys
 
 ## v0.3.1
  - Fix path in examples to work with github action

src/digsim/synth/_synthesis.py

@@ -33,11 +33,18 @@ def _pexpect_wait_for_prompt(cls, pexp):
                     errorline = line
                     break
             raise SynthesisException(errorline)
-        return before_lines
+
+        # Remove escape sequence in output
+        out_lines = []
+        for line in before_lines:
+            if line.startswith("\x1b"):
+                continue
+            out_lines.append(line)
+        return out_lines
 
     @classmethod
     def _pexpect_spawn_yosys(cls):
-        yosys_exe = shutil.which("yowasp-yosys")
+        yosys_exe = shutil.which("yosys") or shutil.which("yowasp-yosys")
 
         if yosys_exe is None:
             raise SynthesisException("Yosys executable not found")

tests/test_yosys_synth.py

@@ -52,7 +52,7 @@ def test_yosys_list_module_with_error(verilog_path):
     """test list modules in single file (with multiple modules)"""
 
     with pytest.raises(SynthesisException):
-        Synthesis.list_modules([str(verilog_path / "moule_with_error.v")])
+        Synthesis.list_modules([str(verilog_path / "module_with_error.v")])
 
 
 def test_yosys_synth_single_file_single_module(verilog_path):
@@ -79,7 +79,7 @@ def test_yosys_synth_single_file_multi_modules(verilog_path):
 def test_yosys_synth_module_with_error(verilog_path):
     """test list modules in single file (with multiple modules)"""
 
-    synthesis = Synthesis(str(verilog_path / "moule_with_error.v"), "error_module")
+    synthesis = Synthesis(str(verilog_path / "module_with_error.v"), "error_module")
 
     with pytest.raises(SynthesisException):
         synthesis.synth_to_dict()