ciel 2.1.2__tar.gz → 2.1.4__tar.gz

{ciel-2.1.2 → ciel-2.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ciel
-Version: 2.1.2
+Version: 2.1.4
 Summary: An PDK builder/version manager for PDKs in the open_pdks format
 Home-page: https://github.com/fossi-foundation/ciel
 License: Apache-2.0

{ciel-2.1.2 → ciel-2.1.4}/ciel/click_common.py

@@ -31,7 +31,7 @@ opt = partial(click.option, show_default=True)
 
 
 class VersionArgument(click.Argument):
-    def make_metavar(self):
+    def make_metavar(self, ctx: Optional[click.Context] = None):
         return "<VERSION>"
 
     def set_tool_metadata_file_path(
@@ -100,7 +100,8 @@ def opt_pdk_root(function: Callable):
         "--pdk",
         cls=PDKOption,
         required=True,
-        help="A valid PDK family or variant (the latter of which is resolved to a family).",
+        envvar=["PDK_FAMILY", "PDK"],
+        help="A valid PDK family or variant (the latter of which is resolved to a family). If the environment PDK_FAMILY or PDK are set, they are used as secondary sources for this value.",
     )(function)
     function = opt(
         "--pdk-root",

{ciel-2.1.2 → ciel-2.1.4}/ciel/common.py

@@ -18,6 +18,7 @@
 import os
 import shutil
 import pathlib
+import warnings
 from datetime import datetime
 from dataclasses import dataclass
 from typing import Optional, List
@@ -82,13 +83,23 @@ def resolve_pdk_family(selector: Optional[str]):
         If selector is None, the PDK_FAMILY and PDK environment variables are
         used as fallbacks. If all are None, the function will simply return None.
 
+        Starting Ciel 3.0.0, supplying None will no longer work and the selector
+        will be a string.
+
         If the selector is invalid, a ValueError will be raised. "ihp_sg13g2"
         will resolve to "ihp-sg13g2" however for some semblance of backwards
         compatibility with previous versions of Ciel/Volare.
     """
-    selector = selector or os.getenv("PDK_FAMILY") or os.getenv("PDK")
     if selector is None:
-        return None  # Let click validator handle it
+        warnings.warn(
+            "Passing None to resolve_pdk_family is deprecated and will be removed in Ciel 3.0.0. Please resolve any environment variables manually.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        if environment_specified_pdk := os.getenv("PDK_FAMILY") or os.getenv("PDK"):
+            selector = environment_specified_pdk
+        if selector is None:
+            return None
 
     if selector == "ihp_sg13g2":
         selector = "ihp-sg13g2"

{ciel-2.1.2 → ciel-2.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ciel"
-version = "2.1.2"
+version = "2.1.4"
 description = "An PDK builder/version manager for PDKs in the open_pdks format"
 authors = ["Mohamed Gaber <me@donn.website>", "Efabless Corporation"]
 readme = "Readme.md"