From 6fb355fc5972bdb4f26e31239e16f716dd144f4c Mon Sep 17 00:00:00 2001 From: Uri Shaked Date: Sun, 25 Jun 2023 20:49:36 +0300 Subject: [PATCH] refactor: migrate from yosys to yowasp-yosys yowasp-yosys can be installed from pip, so we no longer require the user to install yosys separately. also freeze requirements.txt versions for reproducible builds --- project.py | 2 +- requirements.txt | 36 +++++++++++++++++++++++++++++------- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/project.py b/project.py index 986eee3..bb7f348 100644 --- a/project.py +++ b/project.py @@ -46,7 +46,7 @@ class Project(): source_list = " ".join(sources) json_file = 'ports.json' - yosys_cmd = f"yosys -qp 'read_verilog -lib -sv {source_list}; hierarchy -top {top} ; proc; write_json {json_file}'" + yosys_cmd = f"yowasp-yosys -qp 'read_verilog -lib -sv {source_list}; hierarchy -top {top} ; proc; write_json {json_file}'" p = subprocess.run(yosys_cmd, shell=True) if p.returncode != 0: logging.error(f"yosys port read failed for {self}") diff --git a/requirements.txt b/requirements.txt index bcbeda5..9ce815a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,29 @@ -pytz -gdstk -stripe -GitPython -cairosvg -requests -PyYAML +appdirs==1.4.4 +cairocffi==1.6.0 +CairoSVG==2.7.0 +certifi==2023.5.7 +cffi==1.15.1 +charset-normalizer==3.1.0 +click==8.1.3 +cssselect2==0.7.0 +defusedxml==0.7.1 +gdstk==0.9.42 +gitdb==4.0.10 +GitPython==3.1.31 +idna==3.4 +importlib-resources==5.12.0 +numpy==1.24.3 +Pillow==9.5.0 +pycparser==2.21 +pytz==2023.3 +PyYAML==6.0 +requests==2.31.0 +smmap==5.0.0 +stripe==5.4.0 +tinycss2==1.2.1 +urllib3==2.0.3 +wasmtime==9.0.0 +webencodings==0.5.1 +yowasp-runtime==1.22 +yowasp-yosys==0.30.0.0.post538 +zipp==3.15.0