From 29e6a05555649420b9dceacfe22d65f25e6f167b Mon Sep 17 00:00:00 2001 From: Uri Shaked Date: Thu, 2 Oct 2025 08:11:37 +0300 Subject: [PATCH] cleanup: remove .gds.br support We now use .oas instead --- pyproject.toml | 1 - requirements.txt | 13 +------------ shuttle.py | 16 ---------------- 3 files changed, 1 insertion(+), 29 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a2e7a17..855d202 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,6 @@ name = "tt-support-tools" requires-python = ">=3.11" dynamic = ["version"] dependencies = [ - "brotli", "CairoSVG", "chevron", "cocotb", diff --git a/requirements.txt b/requirements.txt index ef59996..bdbacbd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,9 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # pip-compile # -brotli==1.1.0 - # via tt-support-tools (pyproject.toml) cairocffi==1.7.1 # via cairosvg cairosvg==2.8.2 @@ -30,8 +28,6 @@ defusedxml==0.7.1 # via cairosvg distlib==0.4.0 # via virtualenv -exceptiongroup==1.3.0 - # via pytest filelock==3.18.0 # via virtualenv find-libpython==0.4.1 @@ -93,13 +89,6 @@ tinycss2==1.4.0 # via # cairosvg # cssselect2 -tomli==2.2.1 - # via pytest -typing-extensions==4.15.0 - # via - # exceptiongroup - # gdstk - # mistune urllib3==2.5.0 # via requests virtualenv==20.33.1 diff --git a/shuttle.py b/shuttle.py index ab94be0..e7030ed 100644 --- a/shuttle.py +++ b/shuttle.py @@ -5,7 +5,6 @@ import os import shutil from typing import List, Set -import brotli # type: ignore import git import klayout.db as pya import yaml @@ -22,15 +21,6 @@ def copy_print(src: str, dest: str): shutil.copy2(src, dest) -def copy_print_decompress(src: str, dest: str): - os.makedirs(os.path.dirname(dest), exist_ok=True) - with open(src, "rb") as f: - data = f.read() - with open(dest, "wb") as f: - f.write(brotli.decompress(data)) - logging.info(f" -> {dest} (decompressed)") - - def copy_print_convert(src: str, dest: str): os.makedirs(os.path.dirname(dest), exist_ok=True) layout = pya.Layout() @@ -231,12 +221,6 @@ class ShuttleConfig: def copy_macros(self): logging.info("copying macros to tt_top:") copy_print_glob("projects/*/*.gds", "tt-multiplexer/ol2/tt_top/gds") - # Find all the ".gds.br" files, decompress them and copy them to the destination - for file in glob.glob("projects/*/*.gds.br"): - decompressed_name = os.path.splitext(os.path.basename(file))[0] - copy_print_decompress( - file, os.path.join("tt-multiplexer/ol2/tt_top/gds", decompressed_name) - ) # Convert .oas files to .gds for file in glob.glob("projects/*/*.oas"): converted_name = os.path.splitext(os.path.basename(file))[0] + ".gds"