librelane 3.0.0.dev40__py3-none-any.whl → 3.0.0.dev41__py3-none-any.whl

librelane/config/variable.py

@@ -16,7 +16,6 @@ import inspect
 from enum import Enum
 from decimal import Decimal, InvalidOperation
 from dataclasses import (
-    _MISSING_TYPE,
     MISSING,
     asdict,
     dataclass,
@@ -24,6 +23,7 @@ from dataclasses import (
     fields,
     is_dataclass,
 )
+import types
 from typing import (
     ClassVar,
     Dict,
@@ -219,7 +219,8 @@ class Macro:
 
 def is_optional(t: Type[Any]) -> bool:
     type_args = get_args(t)
-    return get_origin(t) is Union and type(None) in type_args
+    origin = get_origin(t)
+    return (origin is Union or origin is types.UnionType) and type(None) in type_args
 
 
 def some_of(t: Type[Any]) -> Type[Any]:
@@ -229,11 +230,20 @@ def some_of(t: Type[Any]) -> Type[Any]:
     # t must be a Union with None if we're here
 
     type_args = get_args(t)
+    origin = get_origin(t)
 
-    args_without_none = [arg for arg in type_args if arg != type(None)]
+    args_without_none = [arg for arg in type_args if arg is not type(None)]
     if len(args_without_none) == 1:
         return args_without_none[0]
 
+    if origin is types.UnionType:
+        # Use the | operator to create a UnionType
+        result = args_without_none[0]
+        for arg in args_without_none[1:]:
+            result = result | arg
+        return result
+
+    # Otherwise, return a typing.Union
     new_union = Union[tuple(args_without_none)]  # type: ignore
     return new_union  # type: ignore
 
@@ -440,7 +450,7 @@ class Variable:
             return_value = list()
             raw = value
             if isinstance(raw, list) or isinstance(raw, tuple):
-                if type_origin == list and type_args == (str,):
+                if type_origin is list and type_args == (str,):
                     if any(isinstance(item, List) for item in raw):
                         Variable.__flatten_list(value)
                 pass
@@ -462,7 +472,7 @@ class Variable:
                     f"List provided for variable '{key_path}' is invalid: {value}"
                 )
 
-            if type_origin == tuple:
+            if type_origin is tuple:
                 if len(raw) != len(type_args):
                     raise ValueError(
                         f"Value provided for variable '{key_path}' of type {validating_type} is invalid: ({len(raw)}/{len(type_args)}) tuple entries provided"
@@ -481,11 +491,11 @@ class Variable:
                     )
                 )
 
-            if type_origin == tuple:
+            if type_origin is tuple:
                 return tuple(return_value)
 
             return return_value
-        elif type_origin == dict:
+        elif type_origin is dict:
             raw = value
             key_type, value_type = type_args
             if isinstance(raw, dict):
@@ -586,7 +596,7 @@ class Variable:
                 field_default = None
                 if (
                     current_field.default is not None
-                    and type(current_field.default) != _MISSING_TYPE
+                    and current_field.default != MISSING
                 ):
                     field_default = current_field.default
                 if current_field.default_factory != MISSING:
@@ -615,7 +625,7 @@ class Variable:
             result = Path(value)
             result.validate(f"Path provided for variable '{key_path}' is invalid")
             return result
-        elif validating_type == bool:
+        elif validating_type is bool:
             if not permissive_typing and not isinstance(value, bool):
                 raise ValueError(
                     f"Refusing to automatically convert '{value}' at '{key_path}' to a Boolean"
@@ -629,7 +639,7 @@ class Variable:
                     f"Value provided for variable '{key_path}' of type {validating_type.__name__} is invalid: '{value}'"
                 )
         elif issubclass(validating_type, Enum):
-            if type(value) == validating_type:
+            if type(value) is validating_type:
                 return value
             try:
                 return validating_type[value]

{librelane-3.0.0.dev40.dist-info → librelane-3.0.0.dev41.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: librelane
-Version: 3.0.0.dev40
+Version: 3.0.0.dev41
 Summary: An infrastructure for implementing chip design flows
 License-Expression: Apache-2.0
 Maintainer: Mohamed Gaber

{librelane-3.0.0.dev40.dist-info → librelane-3.0.0.dev41.dist-info}/RECORD

@@ -23,7 +23,7 @@ librelane/config/flow.py,sha256=Dr2i9MlCcGFg_ilCpeys3vPo_DLDb1yF6yGrMCZZabE,1700
 librelane/config/pdk_compat.py,sha256=ofqYuD-MgTcfvPVXpGJo8H1GKzCvN6sxHsK_OqCVXa8,12870
 librelane/config/preprocessor.py,sha256=ATi29SHz0_OBq1IqUkGxvhHUDKB5z5jO0KqvoQXg8R8,14913
 librelane/config/removals.py,sha256=vxqTuRTJ0jt2TX4KmFZCZPTwghDFkCVjIhF2iReHwJA,2958
-librelane/config/variable.py,sha256=oPPdvo12Gy17sIcEJtjJkrIO93AOUSrIZaG_ocL70vI,26837
+librelane/config/variable.py,sha256=SKhMJT3jnJt7w3vZacD8_4n5YUH3hecG0iAnHjZrkPk,27162
 librelane/container.py,sha256=7w_V2Fpb3dbnZ8FqBce1vK31jH30UrxByppfEJRyG9M,8672
 librelane/env_info.py,sha256=xF9iqwwJv5yZz7n7BTrrT_yP3Dp1HjAOUObNE9k_1g4,11074
 librelane/examples/spm/config.yaml,sha256=H2ERY4xoIeXN7kM3N9yGWiFBbtByyaN2Ni1kFqYPtO4,612
@@ -167,7 +167,7 @@ librelane/steps/step.py,sha256=tYTN5QzX0huhFMLegpir4mPi3q9QAVSFZ7kchW6OECk,55849
 librelane/steps/tclstep.py,sha256=68AjCmbLhBscbzQDxRcPQVU-6UvZQNOalO7qNwUXCa4,10138
 librelane/steps/verilator.py,sha256=m3vcsBStF4i1eutzHdWHPGGoSEBwQrCKMY2k-1qJbMI,8964
 librelane/steps/yosys.py,sha256=lYdZPFvjcmdu_NE6rtB94_dysIK2qwGdGb480W6pg2w,12711
-librelane-3.0.0.dev40.dist-info/METADATA,sha256=wFojMkKM8YiFCuQTjcUa_jUXyZD7zNVaiUA_Vn_uzzU,6572
-librelane-3.0.0.dev40.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-librelane-3.0.0.dev40.dist-info/entry_points.txt,sha256=Ub2wE2U4uZPjJgBVTPYFeXtwhNyqAqaKT8q4jGoKIUk,274
-librelane-3.0.0.dev40.dist-info/RECORD,,
+librelane-3.0.0.dev41.dist-info/METADATA,sha256=IWt1bBVIxOSC6exjyQarc_1wI8h6uZL7enhkjvTbS7U,6572
+librelane-3.0.0.dev41.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+librelane-3.0.0.dev41.dist-info/entry_points.txt,sha256=Ub2wE2U4uZPjJgBVTPYFeXtwhNyqAqaKT8q4jGoKIUk,274
+librelane-3.0.0.dev41.dist-info/RECORD,,