omdev 0.0.0.dev101__tar.gz → 0.0.0.dev103__tar.gz

{omdev-0.0.0.dev101/omdev.egg-info → omdev-0.0.0.dev103}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev101
+Version: 0.0.0.dev103
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev101
+Requires-Dist: omlish==0.0.0.dev103
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev101 → omdev-0.0.0.dev103}/omdev/.manifests.json

@@ -123,7 +123,7 @@
     "module": ".ptk.apps.ncdu",
     "attr": "_CLI_MODULE",
     "file": "omdev/ptk/apps/ncdu.py",
-    "line": 157,
+    "line": 155,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "ptk/ncdu",

{omdev-0.0.0.dev101 → omdev-0.0.0.dev103}/omdev/cli/clicli.py

@@ -51,7 +51,7 @@ class CliCli(ap.Cli):
     )
     def reinstall(self) -> None:
         mod_name = globals()['__spec__'].name
-        tool_name = '.'.join([mod_name.partition('.')[0], 'tools', 'piptools'])
+        tool_name = '.'.join([mod_name.partition('.')[0], 'tools', 'pip'])
 
         out = subprocess.check_output([
             sys.executable,

{omdev-0.0.0.dev101 → omdev-0.0.0.dev103}/omdev/ptk/apps/ncdu.py

@@ -69,12 +69,10 @@ class NcduApp:
 
         self._kb = ptk.KeyBindings()
         self._kb.add('q')(self.exit_app)
-        for k in ['up', 'p']:
-            self._kb.add(k)(self.move_up)
-        for k in ['down', 'n']:
-            self._kb.add(k)(self.move_down)
-        self._kb.add('enter')(self.enter_directory)
-        self._kb.add('backspace')(self.go_back)
+        self._kb.add('up', 'p')(self.move_up)
+        self._kb.add('down', 'n')(self.move_down)
+        self._kb.add('right', 'enter')(self.enter_directory)
+        self._kb.add('left', 'backspace')(self.go_back)
 
         self._layout = ptk.Layout(ptk.Frame(self._text_area))
 

{omdev-0.0.0.dev101 → omdev-0.0.0.dev103}/omdev/scripts/interp.py

@@ -51,7 +51,7 @@ VersionCmpLocalType = ta.Union['NegativeInfinityVersionType', _VersionCmpLocalTy
 VersionCmpKey = ta.Tuple[int, ta.Tuple[int, ...], VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpLocalType]  # noqa
 VersionComparisonMethod = ta.Callable[[VersionCmpKey, VersionCmpKey], bool]
 
-# ../../../omlish/lite/check.py
+# ../../../omlish/lite/cached.py
 T = ta.TypeVar('T')
 
 # ../../packaging/specifiers.py
@@ -471,7 +471,7 @@ def canonicalize_version(
 # ../../../omlish/lite/cached.py
 
 
-class cached_nullary:  # noqa
+class _cached_nullary:  # noqa
     def __init__(self, fn):
         super().__init__()
         self._fn = fn
@@ -488,6 +488,10 @@ class cached_nullary:  # noqa
         return bound
 
 
+def cached_nullary(fn: ta.Callable[..., T]) -> ta.Callable[..., T]:
+    return _cached_nullary(fn)
+
+
 ########################################
 # ../../../omlish/lite/check.py
 
@@ -1692,6 +1696,24 @@ def subprocess_try_output_str(*args: str, **kwargs: ta.Any) -> ta.Optional[str]:
     return out.decode().strip() if out is not None else None
 
 
+##
+
+
+def subprocess_close(
+        proc: subprocess.Popen,
+        timeout: ta.Optional[float] = None,
+) -> None:
+    # TODO: terminate, sleep, kill
+    if proc.stdout:
+        proc.stdout.close()
+    if proc.stderr:
+        proc.stderr.close()
+    if proc.stdin:
+        proc.stdin.close()
+
+    proc.wait(timeout)
+
+
 ########################################
 # ../inspect.py
 

{omdev-0.0.0.dev101 → omdev-0.0.0.dev103}/omdev/scripts/pyproject.py

@@ -90,7 +90,7 @@ TomlParseFloat = ta.Callable[[str], ta.Any]
 TomlKey = ta.Tuple[str, ...]
 TomlPos = int  # ta.TypeAlias
 
-# ../../../omlish/lite/check.py
+# ../../../omlish/lite/cached.py
 T = ta.TypeVar('T')
 
 # ../../packaging/specifiers.py
@@ -1862,7 +1862,7 @@ class WheelFile(zipfile.ZipFile):
 # ../../../omlish/lite/cached.py
 
 
-class cached_nullary:  # noqa
+class _cached_nullary:  # noqa
     def __init__(self, fn):
         super().__init__()
         self._fn = fn
@@ -1879,6 +1879,10 @@ class cached_nullary:  # noqa
         return bound
 
 
+def cached_nullary(fn: ta.Callable[..., T]) -> ta.Callable[..., T]:
+    return _cached_nullary(fn)
+
+
 ########################################
 # ../../../omlish/lite/check.py
 
@@ -3235,7 +3239,7 @@ class DataclassObjMarshaler(ObjMarshaler):
         return {k: m.marshal(getattr(o, k)) for k, m in self.fs.items()}
 
     def unmarshal(self, o: ta.Any) -> ta.Any:
-        return self.ty(**{k: self.fs[k].unmarshal(v) for k, v in o.items() if self.nonstrict or k in self.fs})
+        return self.ty(**{k: self.fs[k].unmarshal(v) for k, v in o.items() if not self.nonstrict or k in self.fs})
 
 
 @dc.dataclass(frozen=True)
@@ -3916,6 +3920,24 @@ def subprocess_try_output_str(*args: str, **kwargs: ta.Any) -> ta.Optional[str]:
     return out.decode().strip() if out is not None else None
 
 
+##
+
+
+def subprocess_close(
+        proc: subprocess.Popen,
+        timeout: ta.Optional[float] = None,
+) -> None:
+    # TODO: terminate, sleep, kill
+    if proc.stdout:
+        proc.stdout.close()
+    if proc.stderr:
+        proc.stderr.close()
+    if proc.stdin:
+        proc.stdin.close()
+
+    proc.wait(timeout)
+
+
 ########################################
 # ../../interp/inspect.py
 

{omdev-0.0.0.dev101 → omdev-0.0.0.dev103/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev101
+Version: 0.0.0.dev103
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev101
+Requires-Dist: omlish==0.0.0.dev103
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev101 → omdev-0.0.0.dev103}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev101
+omlish==0.0.0.dev103
 
 [all]
 black~=24.10

{omdev-0.0.0.dev101 → omdev-0.0.0.dev103}/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.dev101'
+version = '0.0.0.dev103'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev101',
+    'omlish == 0.0.0.dev103',
 ]
 
 [project.optional-dependencies]