ominfra 0.0.0.dev121__tar.gz → 0.0.0.dev122__tar.gz

{ominfra-0.0.0.dev121/ominfra.egg-info → ominfra-0.0.0.dev122}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev121
+Version: 0.0.0.dev122
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev121
-Requires-Dist: omlish==0.0.0.dev121
+Requires-Dist: omdev==0.0.0.dev122
+Requires-Dist: omlish==0.0.0.dev122
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev121 → ominfra-0.0.0.dev122}/ominfra/deploy/_executor.py

@@ -66,6 +66,7 @@ import subprocess
 import sys
 import textwrap
 import threading
+import types
 import typing as ta
 import uuid
 import weakref  # noqa
@@ -255,6 +256,14 @@ def get_optional_alias_arg(spec: ta.Any) -> ta.Any:
     return it
 
 
+def is_new_type(spec: ta.Any) -> bool:
+    if isinstance(ta.NewType, type):
+        return isinstance(spec, ta.NewType)
+    else:
+        # Before https://github.com/python/cpython/commit/c2f33dfc83ab270412bf243fb21f724037effa1a
+        return isinstance(spec, types.FunctionType) and spec.__code__ is ta.NewType.__code__.co_consts[1]  # type: ignore  # noqa
+
+
 def deep_subclasses(cls: ta.Type[T]) -> ta.Iterator[ta.Type[T]]:
     seen = set()
     todo = list(reversed(cls.__subclasses__()))

{ominfra-0.0.0.dev121 → ominfra-0.0.0.dev122}/ominfra/pyremote/_runcommands.py

@@ -24,6 +24,7 @@ import subprocess
 import sys
 import textwrap
 import threading
+import types
 import typing as ta
 import uuid
 import weakref  # noqa
@@ -338,6 +339,14 @@ def get_optional_alias_arg(spec: ta.Any) -> ta.Any:
     return it
 
 
+def is_new_type(spec: ta.Any) -> bool:
+    if isinstance(ta.NewType, type):
+        return isinstance(spec, ta.NewType)
+    else:
+        # Before https://github.com/python/cpython/commit/c2f33dfc83ab270412bf243fb21f724037effa1a
+        return isinstance(spec, types.FunctionType) and spec.__code__ is ta.NewType.__code__.co_consts[1]  # type: ignore  # noqa
+
+
 def deep_subclasses(cls: ta.Type[T]) -> ta.Iterator[ta.Type[T]]:
     seen = set()
     todo = list(reversed(cls.__subclasses__()))

{ominfra-0.0.0.dev121 → ominfra-0.0.0.dev122}/ominfra/scripts/journald2aws.py

@@ -1102,6 +1102,14 @@ def get_optional_alias_arg(spec: ta.Any) -> ta.Any:
     return it
 
 
+def is_new_type(spec: ta.Any) -> bool:
+    if isinstance(ta.NewType, type):
+        return isinstance(spec, ta.NewType)
+    else:
+        # Before https://github.com/python/cpython/commit/c2f33dfc83ab270412bf243fb21f724037effa1a
+        return isinstance(spec, types.FunctionType) and spec.__code__ is ta.NewType.__code__.co_consts[1]  # type: ignore  # noqa
+
+
 def deep_subclasses(cls: ta.Type[T]) -> ta.Iterator[ta.Type[T]]:
     seen = set()
     todo = list(reversed(cls.__subclasses__()))

{ominfra-0.0.0.dev121 → ominfra-0.0.0.dev122}/ominfra/scripts/supervisor.py

@@ -1511,6 +1511,14 @@ def get_optional_alias_arg(spec: ta.Any) -> ta.Any:
     return it
 
 
+def is_new_type(spec: ta.Any) -> bool:
+    if isinstance(ta.NewType, type):
+        return isinstance(spec, ta.NewType)
+    else:
+        # Before https://github.com/python/cpython/commit/c2f33dfc83ab270412bf243fb21f724037effa1a
+        return isinstance(spec, types.FunctionType) and spec.__code__ is ta.NewType.__code__.co_consts[1]  # type: ignore  # noqa
+
+
 def deep_subclasses(cls: ta.Type[T]) -> ta.Iterator[ta.Type[T]]:
     seen = set()
     todo = list(reversed(cls.__subclasses__()))
@@ -1687,7 +1695,7 @@ def as_injector_key(o: ta.Any) -> InjectorKey:
         raise TypeError(o)
     if isinstance(o, InjectorKey):
         return o
-    if isinstance(o, (type, ta.NewType)):
+    if isinstance(o, type) or is_new_type(o):
         return InjectorKey(o)
     raise TypeError(o)
 
@@ -1803,6 +1811,7 @@ class _InjectorBindings(InjectorBindings):
 def as_injector_bindings(*args: InjectorBindingOrBindings) -> InjectorBindings:
     bs: ta.List[InjectorBinding] = []
     ps: ta.List[InjectorBindings] = []
+
     for a in args:
         if isinstance(a, InjectorBindings):
             ps.append(a)
@@ -1810,6 +1819,7 @@ def as_injector_bindings(*args: InjectorBindingOrBindings) -> InjectorBindings:
             bs.append(a)
         else:
             raise TypeError(a)
+
     return _InjectorBindings(
         bs or None,
         ps or None,
@@ -1831,10 +1841,12 @@ class OverridesInjectorBindings(InjectorBindings):
 
 def injector_override(p: InjectorBindings, *args: InjectorBindingOrBindings) -> InjectorBindings:
     m: ta.Dict[InjectorKey, InjectorBinding] = {}
+
     for b in as_injector_bindings(*args).bindings():
         if b.key in m:
             raise DuplicateInjectorKeyError(b.key)
         m[b.key] = b
+
     return OverridesInjectorBindings(p, m)
 
 

{ominfra-0.0.0.dev121 → ominfra-0.0.0.dev122/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev121
+Version: 0.0.0.dev122
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev121
-Requires-Dist: omlish==0.0.0.dev121
+Requires-Dist: omdev==0.0.0.dev122
+Requires-Dist: omlish==0.0.0.dev122
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev121 → ominfra-0.0.0.dev122}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev121
-omlish==0.0.0.dev121
+omdev==0.0.0.dev122
+omlish==0.0.0.dev122
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev121 → ominfra-0.0.0.dev122}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev121'
+version = '0.0.0.dev122'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev121',
-    'omlish == 0.0.0.dev121',
+    'omdev == 0.0.0.dev122',
+    'omlish == 0.0.0.dev122',
 ]
 
 [project.optional-dependencies]