omdev 0.0.30__tar.gz → 0.0.32__tar.gz

{omdev-0.0.30/omdev.egg-info → omdev-0.0.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.30
+Version: 0.0.32
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -13,10 +13,10 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omcore==0.0.30
+Requires-Dist: omcore==0.0.32
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.30; extra == "all"
-Requires-Dist: omllm==0.0.30; extra == "all"
+Requires-Dist: ominfra==0.0.32; extra == "all"
+Requires-Dist: omllm==0.0.32; extra == "all"
 Requires-Dist: black~=26.5; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -35,9 +35,9 @@ Requires-Dist: textual~=8.2; extra == "all"
 Requires-Dist: textual-dev~=1.8; extra == "all"
 Requires-Dist: textual-speedups~=0.2; extra == "all"
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.30; extra == "ominfra"
+Requires-Dist: ominfra==0.0.32; extra == "ominfra"
 Provides-Extra: omllm
-Requires-Dist: omllm==0.0.30; extra == "omllm"
+Requires-Dist: omllm==0.0.32; extra == "omllm"
 Provides-Extra: black
 Requires-Dist: black~=26.5; extra == "black"
 Provides-Extra: c

{omdev-0.0.30 → omdev-0.0.32}/omdev/ci/docker/cacheserved/cache.py

@@ -135,7 +135,7 @@ class CacheServedDockerCache(DockerCache):
                     'localhost',
                     self._config.port,
                     timeout=timeout,
-                    on_fail=lambda _: log.exception('Failed to connect to cache server - will try again'),
+                    on_fail=lambda _: log.exception('Failed to connect to cache server - will try again'),  # noqa
                     sleep_s=self._config.server_start_sleep,
                 )
 

{omdev-0.0.30 → omdev-0.0.32}/omdev/dataclasses/codegen.py

@@ -292,7 +292,7 @@ class DataclassCodeGen:
         # Sorted by first cls name for more stable diffs than say sha1
         for grp in sorted(
                 dumped_by_plan_repr.values(),
-                key=lambda grp: sorted([(y.cls_module, y.cls_qualname) for y in grp])[0],
+                key=lambda grp: min([(y.cls_module, y.cls_qualname) for y in grp]),
         ):
             x = grp[0]
             pr = x.plan_repr

{omdev-0.0.30 → omdev-0.0.32}/omdev/packaging/marshal.py

@@ -9,24 +9,24 @@ from omcore import lang
 from omcore import marshal as msh
 from omcore import reflect as rfl
 
-from .requires import ParsedRequirement
-from .requires import RequiresMarkerItem
-from .requires import RequiresMarkerList
-from .requires import RequiresNode
-from .requires import RequiresOp
-from .requires import RequiresValue
-from .requires import RequiresVariable
+from .requirements import ParsedRequirement
+from .requirements import RequirementMarkerItem
+from .requirements import RequirementMarkerList
+from .requirements import RequirementNode
+from .requirements import RequirementOp
+from .requirements import RequirementValue
+from .requirements import RequirementVariable
 
 
 ##
 
 
-class MarshalRequiresMarkerList(lang.NotInstantiable, lang.Final):
+class MarshalRequirementMarkerList(lang.NotInstantiable, lang.Final):
     pass
 
 
 @dc.dataclass(frozen=True)
-class RequiresMarkerListMarshaler(msh.Marshaler):
+class RequirementMarkerListMarshaler(msh.Marshaler):
     item_m: msh.Marshaler
     node_m: msh.Marshaler
 
@@ -34,7 +34,7 @@ class RequiresMarkerListMarshaler(msh.Marshaler):
         def inner(c: ta.Any) -> ta.Any:
             if isinstance(c, str):
                 return c
-            elif isinstance(c, RequiresMarkerItem):
+            elif isinstance(c, RequirementMarkerItem):
                 return self.item_m.marshal(ctx, c)
             elif isinstance(c, ta.Iterable):
                 return [inner(e) for e in c]
@@ -43,13 +43,13 @@ class RequiresMarkerListMarshaler(msh.Marshaler):
         return [inner(e) for e in o]
 
 
-class RequiresMarkerListMarshalerFactory(msh.MarshalerFactory):
+class RequirementMarkerListMarshalerFactory(msh.MarshalerFactory):
     def make_marshaler(self, ctx: msh.MarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
-        if rty.runtime_object is not MarshalRequiresMarkerList:
+        if rty.runtime_object is not MarshalRequirementMarkerList:
             return None
-        return lambda: RequiresMarkerListMarshaler(
-            ctx.make_marshaler(RequiresMarkerItem),
-            ctx.make_marshaler(RequiresNode),
+        return lambda: RequirementMarkerListMarshaler(
+            ctx.make_marshaler(RequirementMarkerItem),
+            ctx.make_marshaler(RequirementNode),
         )
 
 
@@ -59,11 +59,11 @@ class RequiresMarkerListMarshalerFactory(msh.MarshalerFactory):
 @msh.register_global_lazy_init
 def _install_standard_marshaling(cfgs: msh.ConfigRegistry) -> None:
     requires_node_poly = msh.Polymorphism(
-        RequiresNode,
+        RequirementNode,
         [
-            msh.Impl(RequiresVariable, 'variable'),
-            msh.Impl(RequiresValue, 'value'),
-            msh.Impl(RequiresOp, 'op'),
+            msh.Impl(RequirementVariable, 'variable'),
+            msh.Impl(RequirementValue, 'value'),
+            msh.Impl(RequirementOp, 'op'),
         ],
     )
     msh.install_standard_factories(
@@ -74,12 +74,12 @@ def _install_standard_marshaling(cfgs: msh.ConfigRegistry) -> None:
 
     msh.install_standard_factories(
         cfgs,
-        RequiresMarkerListMarshalerFactory(),
+        RequirementMarkerListMarshalerFactory(),
     )
 
     cfgs.update(
-        RequiresMarkerList,
-        msh.ReflectOverride(MarshalRequiresMarkerList),
+        RequirementMarkerList,
+        msh.ReflectOverride(MarshalRequirementMarkerList),
         identity=True,
     )
 
@@ -88,8 +88,8 @@ def _install_standard_marshaling(cfgs: msh.ConfigRegistry) -> None:
         msh.ObjectOptions(
             fields=dict(
                 marker=msh.FieldOptions(
-                    marshal_via=msh.MarshalVia(RequiresMarkerList | None),
-                    unmarshal_via=msh.UnmarshalVia(RequiresMarkerList | None),
+                    marshal_via=msh.MarshalVia(RequirementMarkerList | None),
+                    unmarshal_via=msh.UnmarshalVia(RequirementMarkerList | None),
                 ),
             ),
         ),

{omdev-0.0.30 → omdev-0.0.32}/omdev/packaging/names.py

@@ -22,6 +22,10 @@
 # details.
 # https://github.com/pypa/packaging/blob/cf2cbe2aec28f87c6228a6fb136c27931c9af407/src/packaging/utils.py
 import re
+import typing as ta
+
+
+NormalizedName = ta.NewType('NormalizedName', str)
 
 
 ##
@@ -36,12 +40,12 @@ _CANONICAL_NAME_NORMALIZED_PATTERN = re.compile(r'^([a-z0-9]|[a-z0-9]([a-z0-9-](
 _CANONICAL_NAME_BUILD_TAG_PATTERN = re.compile(r'(\d+)(.*)')
 
 
-def canonicalize_name(name: str, *, validate: bool = False) -> str:
+def canonicalize_name(name: str, *, validate: bool = False) -> NormalizedName:
     if validate and not _CANONICAL_NAME_VALIDATE_PATTERN.match(name):
         raise NameError(f'name is invalid: {name!r}')
     # This is taken from PEP 503.
     value = _CANONICAL_NAME_CANONICALIZE_PATTERN.sub('-', name).lower()
-    return value
+    return NormalizedName(value)
 
 
 def is_normalized_name(name: str) -> bool: