librelane 2.4.0.dev4__tar.gz → 2.4.0.dev5__tar.gz

{librelane-2.4.0.dev4 → librelane-2.4.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: librelane
-Version: 2.4.0.dev4
+Version: 2.4.0.dev5
 Summary: An infrastructure for implementing chip design flows
 Home-page: https://github.com/librelane/librelane
 License: Apache-2.0
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: ciel (>=0.16.0)
-Requires-Dist: click (>=8,<9)
+Requires-Dist: click (>=8,<8.2)
 Requires-Dist: cloup (>=3.0.5,<4)
 Requires-Dist: deprecated (>=1.2.10,<2)
 Requires-Dist: httpx (>=0.22.0,<0.29)

{librelane-2.4.0.dev4 → librelane-2.4.0.dev5}/librelane/common/cli.py

@@ -67,7 +67,7 @@ class IntEnumChoice(Choice):
                 f"{value} is not a not a valid value for IntEnum {self.__enum.__name__}"
             )
 
-    def get_metavar(self, param: "Parameter") -> str:
+    def get_metavar(self, param: Parameter) -> str:
         _bk = self.choices
         self.choices = [f"{e.name} or {e.value}" for e in self.__enum]
         result = super().get_metavar(param)

{librelane-2.4.0.dev4 → librelane-2.4.0.dev5}/librelane/common/metrics/__main__.py

@@ -286,7 +286,7 @@ cli.add_command(compare_multiple)
 @cloup.option(
     "-m",
     "--metric-repo",
-    default="efabless/librelane-metrics",
+    default="librelane/librelane-metrics",
     help="The repository storing metrics for --repo",
 )
 @cloup.option(

{librelane-2.4.0.dev4 → librelane-2.4.0.dev5}/librelane/state/design_format.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from enum import Enum
-from dataclasses import dataclass
 from typing import Dict, Optional
+from dataclasses import dataclass, replace
 
 
 @dataclass
@@ -44,10 +44,16 @@ class DesignFormatObject:
     folder_override: Optional[str] = None
     multiple: bool = False
 
+    _instance_optional: bool = False
+
     @property
     def folder(self) -> str:
         return self.folder_override or self.id
 
+    @property
+    def optional(self) -> bool:
+        return self._instance_optional
+
 
 class DesignFormat(Enum):
     """
@@ -174,6 +180,15 @@ class DesignFormat(Enum):
     def by_id(id: str) -> Optional["DesignFormat"]:
         return _designformat_by_id.get(id)
 
+    def mkOptional(self) -> "DesignFormat":
+        # HACK: Create ephemeral DesignFormat copy until 3.0.0 lets us do this
+        # a bit more appropriately.
+        clone = object.__new__(DesignFormat)
+        clone._name_ = self._name_
+        clone._value_ = replace(self._value_)
+        clone._value_._instance_optional = True
+        return clone
+
 
 _designformat_by_id: Dict[str, "DesignFormat"] = {
     format.value.id: format for format in DesignFormat

{librelane-2.4.0.dev4 → librelane-2.4.0.dev5}/librelane/steps/openroad.py

@@ -778,7 +778,10 @@ class STAPostPNR(STAPrePNR):
         ),
     ]
 
-    inputs = STAPrePNR.inputs + [DesignFormat.SPEF, DesignFormat.ODB]
+    inputs = STAPrePNR.inputs + [
+        DesignFormat.SPEF,
+        DesignFormat.ODB.mkOptional(),
+    ]
     outputs = STAPrePNR.outputs + [DesignFormat.LIB]
 
     def prepare_env(self, env: dict, state: State) -> dict:
@@ -851,19 +854,21 @@ class STAPostPNR(STAPrePNR):
     ) -> MetricsUpdate:
         current_env["_LIB_SAVE_DIR"] = corner_dir
         metrics_updates = super().run_corner(state_in, current_env, corner, corner_dir)
-        try:
-            filter_unannotated_metrics = self.filter_unannotated_report(
-                corner=corner,
-                checks_report=os.path.join(corner_dir, "checks.rpt"),
-                corner_dir=corner_dir,
-                env=current_env,
-                odb_design=str(state_in[DesignFormat.ODB]),
-            )
-        except subprocess.CalledProcessError as e:
-            self.err(
-                f"Failed filtering unannotated nets for the {corner} timing corner."
-            )
-            raise e
+        filter_unannotated_metrics = {}
+        if odb := state_in[DesignFormat.ODB]:
+            try:
+                filter_unannotated_metrics = self.filter_unannotated_report(
+                    corner=corner,
+                    checks_report=os.path.join(corner_dir, "checks.rpt"),
+                    corner_dir=corner_dir,
+                    env=current_env,
+                    odb_design=str(odb),
+                )
+            except subprocess.CalledProcessError as e:
+                self.err(
+                    f"Failed filtering unannotated nets for the {corner} timing corner."
+                )
+                raise e
         return {**metrics_updates, **filter_unannotated_metrics}
 
     def run(self, state_in: State, **kwargs) -> Tuple[ViewsUpdate, MetricsUpdate]:

{librelane-2.4.0.dev4 → librelane-2.4.0.dev5}/librelane/steps/step.py

@@ -53,7 +53,13 @@ from ..config import (
     Variable,
     universal_flow_config_variables,
 )
-from ..state import DesignFormat, DesignFormatObject, State, InvalidState, StateElement
+from ..state import (
+    DesignFormat,
+    DesignFormatObject,
+    State,
+    InvalidState,
+    StateElement,
+)
 from ..common import (
     GenericDict,
     GenericImmutableDict,
@@ -661,7 +667,10 @@ class Step(ABC):
             for input, output in zip_longest(Self.inputs, Self.outputs):
                 input_str = ""
                 if input is not None:
-                    input_str = f"{input.value.name} (.{input.value.extension})"
+                    optional = "?" if input.value.optional else ""
+                    input_str = (
+                        f"{input.value.name}{optional} (.{input.value.extension})"
+                    )
 
                 output_str = ""
                 if output is not None:
@@ -1141,7 +1150,7 @@ class Step(ABC):
 
         for input in self.inputs:
             value = state_in_result[input]
-            if value is None:
+            if value is None and not input.value.optional:
                 raise StepException(
                     f"{type(self).__name__}: missing required input '{input.name}'"
                 ) from None

{librelane-2.4.0.dev4 → librelane-2.4.0.dev5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "librelane"
-version = "2.4.0.dev4"
+version = "2.4.0.dev5"
 description = "An infrastructure for implementing chip design flows"
 authors = ["Mohamed Gaber <me@donn.website>", "Efabless Corporation"]
 readme = "Readme.md"
@@ -11,7 +11,7 @@ documentation = "https://librelane.readthedocs.io"
 
 [tool.poetry.dependencies]
 python = ">=3.8,<4"
-click = ">=8,<9"
+click = ">=8,<8.2"
 cloup = ">=3.0.5,<4"
 pyyaml = ">=5,<7"
 rich = ">=12,<14"
@@ -31,8 +31,7 @@ semver = "^3.0.2"
 wheel = "*"
 black = ">=24.4.0,<25"
 
-flake8 = ">=4"
-flake8-no-implicit-concat = "0.3.3"
+flake8 = { version = ">=7", markers = "python_version >= \"3.8.1\"" }
 flake8-pytest-style = "*"
 
 mypy = ">=1.9.0,<1.10.0"