omdev 0.0.0.dev283__tar.gz → 0.0.0.dev284__tar.gz

{omdev-0.0.0.dev283/omdev.egg-info → omdev-0.0.0.dev284}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev283
+Version: 0.0.0.dev284
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,18 +12,17 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev283
+Requires-Dist: omlish==0.0.0.dev284
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: docutils~=0.21; extra == "all"
-Requires-Dist: markdown-it-py~=3.7; extra == "all"
+Requires-Dist: markdown-it-py~=3.0; extra == "all"
 Requires-Dist: mypy~=1.15; extra == "all"
-Requires-Dist: gprof2dot~=2024.6; extra == "all"
+Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: prompt-toolkit~=3.0; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
-Requires-Dist: wheel~=0.45; extra == "all"
 Provides-Extra: black
 Requires-Dist: black~=25.1; extra == "black"
 Provides-Extra: c
@@ -31,15 +30,13 @@ Requires-Dist: pycparser~=2.22; extra == "c"
 Requires-Dist: pcpp~=1.30; extra == "c"
 Provides-Extra: doc
 Requires-Dist: docutils~=0.21; extra == "doc"
-Requires-Dist: markdown-it-py~=3.7; extra == "doc"
+Requires-Dist: markdown-it-py~=3.0; extra == "doc"
 Provides-Extra: mypy
 Requires-Dist: mypy~=1.15; extra == "mypy"
 Provides-Extra: prof
-Requires-Dist: gprof2dot~=2024.6; extra == "prof"
+Requires-Dist: gprof2dot~=2025.4; extra == "prof"
 Provides-Extra: ptk
 Requires-Dist: prompt-toolkit~=3.0; extra == "ptk"
 Provides-Extra: qr
 Requires-Dist: segno~=1.6; extra == "qr"
-Provides-Extra: wheel
-Requires-Dist: wheel~=0.45; extra == "wheel"
 Dynamic: license-file

{omdev-0.0.0.dev283 → omdev-0.0.0.dev284}/omdev/.manifests.json

@@ -11,30 +11,6 @@
       }
     }
   },
-  {
-    "module": ".attrdocs",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/attrdocs.py",
-    "line": 146,
-    "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/attrdocs",
-        "mod_name": "omdev.attrdocs"
-      }
-    }
-  },
-  {
-    "module": ".bracepy",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/bracepy.py",
-    "line": 94,
-    "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "bracepy",
-        "mod_name": "omdev.bracepy"
-      }
-    }
-  },
   {
     "module": ".cc.__main__",
     "attr": "_CLI_MODULE",
@@ -59,18 +35,6 @@
       }
     }
   },
-  {
-    "module": ".classdot",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/classdot.py",
-    "line": 65,
-    "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/classdot",
-        "mod_name": "omdev.classdot"
-      }
-    }
-  },
   {
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
@@ -83,18 +47,6 @@
       }
     }
   },
-  {
-    "module": ".findimports",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/findimports.py",
-    "line": 87,
-    "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/findimports",
-        "mod_name": "omdev.findimports"
-      }
-    }
-  },
   {
     "module": ".imgur",
     "attr": "_FOO_CLI_MODULE",
@@ -168,50 +120,122 @@
     }
   },
   {
-    "module": ".pyproject.__main__",
+    "module": ".py.attrdocs",
     "attr": "_CLI_MODULE",
-    "file": "omdev/pyproject/__main__.py",
-    "line": 4,
+    "file": "omdev/py/attrdocs.py",
+    "line": 146,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "pyproject",
-        "mod_name": "omdev.pyproject.__main__"
+        "cmd_name": "py/attrdocs",
+        "mod_name": "omdev.py.attrdocs"
+      }
+    }
+  },
+  {
+    "module": ".py.bracepy",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/py/bracepy.py",
+    "line": 94,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "bracepy",
+        "mod_name": "omdev.py.bracepy"
+      }
+    }
+  },
+  {
+    "module": ".py.classdot",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/py/classdot.py",
+    "line": 63,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "py/classdot",
+        "mod_name": "omdev.py.classdot"
       }
     }
   },
   {
-    "module": ".scripts.execrss",
+    "module": ".py.findimports",
     "attr": "_CLI_MODULE",
-    "file": "omdev/scripts/execrss.py",
+    "file": "omdev/py/findimports.py",
+    "line": 87,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "py/findimports",
+        "mod_name": "omdev.py.findimports"
+      }
+    }
+  },
+  {
+    "module": ".py.scripts.execrss",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/py/scripts/execrss.py",
     "line": 11,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/execrss",
-        "mod_name": "omdev.scripts.execrss"
+        "mod_name": "omdev.py.scripts.execrss"
       }
     }
   },
   {
-    "module": ".scripts.exectime",
+    "module": ".py.scripts.exectime",
     "attr": "_CLI_MODULE",
-    "file": "omdev/scripts/exectime.py",
+    "file": "omdev/py/scripts/exectime.py",
     "line": 66,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/exectime",
-        "mod_name": "omdev.scripts.exectime"
+        "mod_name": "omdev.py.scripts.exectime"
       }
     }
   },
   {
-    "module": ".scripts.importtrace",
+    "module": ".py.scripts.importtrace",
     "attr": "_CLI_MODULE",
-    "file": "omdev/scripts/importtrace.py",
+    "file": "omdev/py/scripts/importtrace.py",
     "line": 477,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/importtrace",
-        "mod_name": "omdev.scripts.importtrace"
+        "mod_name": "omdev.py.scripts.importtrace"
+      }
+    }
+  },
+  {
+    "module": ".py.tools.importscan",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/py/tools/importscan.py",
+    "line": 178,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "py/importscan",
+        "mod_name": "omdev.py.tools.importscan"
+      }
+    }
+  },
+  {
+    "module": ".py.tools.mkrelimp",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/py/tools/mkrelimp.py",
+    "line": 146,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "py/mkrelimp",
+        "mod_name": "omdev.py.tools.mkrelimp"
+      }
+    }
+  },
+  {
+    "module": ".pyproject.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/pyproject/__main__.py",
+    "line": 4,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "pyproject",
+        "mod_name": "omdev.pyproject.__main__"
       }
     }
   },
@@ -315,18 +339,6 @@
       }
     }
   },
-  {
-    "module": ".tools.importscan",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/tools/importscan.py",
-    "line": 178,
-    "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/importscan",
-        "mod_name": "omdev.tools.importscan"
-      }
-    }
-  },
   {
     "module": ".tools.intellij",
     "attr": "_CLI_MODULE",
@@ -383,18 +395,6 @@
       }
     }
   },
-  {
-    "module": ".tools.mkrelimp",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/tools/mkrelimp.py",
-    "line": 146,
-    "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/mkrelimp",
-        "mod_name": "omdev.tools.mkrelimp"
-      }
-    }
-  },
   {
     "module": ".tools.notebook",
     "attr": "_CLI_MODULE",

{omdev-0.0.0.dev283 → omdev-0.0.0.dev284}/omdev/__about__.py

@@ -24,7 +24,7 @@ class Project(ProjectBase):
         'doc': [
             'docutils ~= 0.21',
 
-            'markdown-it-py ~= 3.7',
+            'markdown-it-py ~= 3.0',
             # 'mdit-py-plugins ~= 0.4',
         ],
 
@@ -33,7 +33,7 @@ class Project(ProjectBase):
         ],
 
         'prof': [
-            'gprof2dot ~= 2024.6',
+            'gprof2dot ~= 2025.4',
         ],
 
         'ptk': [
@@ -43,10 +43,6 @@ class Project(ProjectBase):
         'qr': [
             'segno ~= 1.6',
         ],
-
-        'wheel': [
-            'wheel ~= 0.45',
-        ],
     }
 
     entry_points = {

{omdev-0.0.0.dev283 → omdev-0.0.0.dev284}/omdev/cache/compute/types.py

@@ -90,7 +90,7 @@ class Object(lang.Abstract):
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class CacheKey(lang.Abstract, ta.Generic[NameT]):
     name: NameT
 

{omdev-0.0.0.dev283 → omdev-0.0.0.dev284}/omdev/precheck/scripts.py

@@ -3,8 +3,8 @@ import os
 import stat
 import typing as ta
 
-from .. import findimports
 from .. import magic
+from ..py import findimports
 from .base import Precheck
 from .base import PrecheckContext
 

omdev-0.0.0.dev284/omdev/py/__init__.py

@@ -0,0 +1,3 @@
+"""
+Python source-related utilities.
+"""

{omdev-0.0.0.dev283/omdev → omdev-0.0.0.dev284/omdev/py}/attrdocs.py

@@ -7,7 +7,7 @@ import typing as ta
 from omlish import check
 from omlish import lang
 
-from .tokens import all as tks
+from ..tokens import all as tks
 
 
 ##

{omdev-0.0.0.dev283/omdev → omdev-0.0.0.dev284/omdev/py}/classdot.py

@@ -7,8 +7,6 @@ import typing as ta
 
 from omlish.graphs import dot
 
-from .cli import CliModule
-
 
 ##
 
@@ -63,7 +61,10 @@ def _main() -> None:
 
 
 # @omlish-manifest
-_CLI_MODULE = CliModule('py/classdot', __name__)
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'py/classdot',
+    'mod_name': __name__,
+}}
 
 
 if __name__ == '__main__':

{omdev-0.0.0.dev283/omdev → omdev-0.0.0.dev284/omdev/py}/tools/importscan.py

@@ -26,7 +26,7 @@ from omlish import check
 from omlish import concurrent as cu
 from omlish import lang
 
-from ..cli import CliModule
+from ...cli import CliModule
 
 
 ##

{omdev-0.0.0.dev283/omdev → omdev-0.0.0.dev284/omdev/py}/tools/mkrelimp.py

@@ -6,8 +6,8 @@ import typing as ta
 
 from omlish.logs import all as logs
 
-from ..cli import CliModule
-from ..tokens import all as tks
+from ...cli import CliModule
+from ...tokens import all as tks
 
 
 T = ta.TypeVar('T')

{omdev-0.0.0.dev283 → omdev-0.0.0.dev284}/omdev/scripts/ci.py

@@ -50,6 +50,7 @@ import json
 import logging
 import os
 import os.path
+import re
 import selectors
 import shlex
 import shutil
@@ -5572,19 +5573,77 @@ class StringMangler:
         check.not_in(self.escape, self.escaped)
         check.arg(len(set(self.escaped)) == len(self.escaped))
 
+    #
+
+    @cached_nullary
+    def replaced(self) -> ta.Tuple[str, ...]:
+        return (self.escape, *self.escaped)
+
+    @cached_nullary
+    def replaced_set(self) -> ta.FrozenSet[str]:
+        return frozenset(self.replaced())
+
+    @cached_nullary
+    def replaced_indexes(self) -> ta.Mapping[str, int]:
+        return {s: i for i, s in enumerate(self.replaced())}
+
+    @cached_nullary
+    def replaced_pat(self) -> re.Pattern:
+        return re.compile('|'.join(re.escape(k) for k in self.replaced()))
+
+    #
+
+    @cached_nullary
+    def replacement_pad(self) -> int:
+        return len('%x' % (len(self.replaced()),))  # noqa
+
     @cached_nullary
     def replacements(self) -> ta.Sequence[ta.Tuple[str, str]]:
-        return [(l, self.escape + str(i)) for i, l in enumerate([self.escape, *self.escaped])]
+        fmt = f'%0{self.replacement_pad()}x'
+        return [
+            (l, self.escape + fmt % (i,))
+            for i, l in enumerate(self.replaced())
+        ]
+
+    @cached_nullary
+    def replacements_dict(self) -> ta.Mapping[str, str]:
+        return dict(self.replacements())
+
+    @cached_nullary
+    def inverse_replacements_dict(self) -> ta.Mapping[str, str]:
+        return {v: k for k, v in self.replacements()}
+
+    @cached_nullary
+    def replacements_pat(self) -> re.Pattern:
+        return re.compile(''.join([re.escape(self.escape), '.' * self.replacement_pad()]))
+
+    #
+
+    # def mangle(self, s: str) -> str:
+    #     ecs = sorted(
+    #         frozenset(s) & self.replaced_set(),
+    #         key=self.replaced_indexes().__getitem__,
+    #         )
+    #     rd = self.replacements_dict()
+    #     for l in ecs:
+    #         r = rd[l]
+    #         s = s.replace(l, r)
+    #     return s
 
     def mangle(self, s: str) -> str:
-        for l, r in self.replacements():
-            s = s.replace(l, r)
-        return s
+        rd = self.replacements_dict()
+        return self.replaced_pat().sub(lambda m: rd[m.group(0)], s)
+
+    #
+
+    # def unmangle(self, s: str) -> str:
+    #     for l, r in reversed(self.replacements()):
+    #         s = s.replace(r, l)
+    #     return s
 
     def unmangle(self, s: str) -> str:
-        for l, r in reversed(self.replacements()):
-            s = s.replace(r, l)
-        return s
+        ird = self.inverse_replacements_dict()
+        return self.replacements_pat().sub(lambda m: ird[m.group(0)], s)
 
 
 ########################################

{omdev-0.0.0.dev283 → omdev-0.0.0.dev284}/omdev/tokens/utils.py

@@ -28,6 +28,8 @@ def ignore_ws(
         *,
         keep: ta.Container[str] = (),
 ) -> ta.Iterable[Token]:
+    if isinstance(keep, str):
+        raise TypeError(keep)
     return (
         t
         for t in toks

{omdev-0.0.0.dev283 → omdev-0.0.0.dev284/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev283
+Version: 0.0.0.dev284
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,18 +12,17 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev283
+Requires-Dist: omlish==0.0.0.dev284
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: docutils~=0.21; extra == "all"
-Requires-Dist: markdown-it-py~=3.7; extra == "all"
+Requires-Dist: markdown-it-py~=3.0; extra == "all"
 Requires-Dist: mypy~=1.15; extra == "all"
-Requires-Dist: gprof2dot~=2024.6; extra == "all"
+Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: prompt-toolkit~=3.0; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
-Requires-Dist: wheel~=0.45; extra == "all"
 Provides-Extra: black
 Requires-Dist: black~=25.1; extra == "black"
 Provides-Extra: c
@@ -31,15 +30,13 @@ Requires-Dist: pycparser~=2.22; extra == "c"
 Requires-Dist: pcpp~=1.30; extra == "c"
 Provides-Extra: doc
 Requires-Dist: docutils~=0.21; extra == "doc"
-Requires-Dist: markdown-it-py~=3.7; extra == "doc"
+Requires-Dist: markdown-it-py~=3.0; extra == "doc"
 Provides-Extra: mypy
 Requires-Dist: mypy~=1.15; extra == "mypy"
 Provides-Extra: prof
-Requires-Dist: gprof2dot~=2024.6; extra == "prof"
+Requires-Dist: gprof2dot~=2025.4; extra == "prof"
 Provides-Extra: ptk
 Requires-Dist: prompt-toolkit~=3.0; extra == "ptk"
 Provides-Extra: qr
 Requires-Dist: segno~=1.6; extra == "qr"
-Provides-Extra: wheel
-Requires-Dist: wheel~=0.45; extra == "wheel"
 Dynamic: license-file

{omdev-0.0.0.dev283 → omdev-0.0.0.dev284}/omdev.egg-info/SOURCES.txt

@@ -5,11 +5,7 @@ pyproject.toml
 omdev/.manifests.json
 omdev/__about__.py
 omdev/__init__.py
-omdev/attrdocs.py
-omdev/bracepy.py
-omdev/classdot.py
 omdev/cmake.py
-omdev/findimports.py
 omdev/imgur.py
 omdev/pip.py
 omdev/tagstrings.py
@@ -207,6 +203,19 @@ omdev/precheck/scripts.py
 omdev/ptk/__init__.py
 omdev/ptk/apps/__init__.py
 omdev/ptk/apps/ncdu.py
+omdev/py/__init__.py
+omdev/py/attrdocs.py
+omdev/py/bracepy.py
+omdev/py/classdot.py
+omdev/py/findimports.py
+omdev/py/scripts/__init__.py
+omdev/py/scripts/bumpversion.py
+omdev/py/scripts/execrss.py
+omdev/py/scripts/exectime.py
+omdev/py/scripts/importtrace.py
+omdev/py/tools/__init__.py
+omdev/py/tools/importscan.py
+omdev/py/tools/mkrelimp.py
 omdev/pyproject/__init__.py
 omdev/pyproject/__main__.py
 omdev/pyproject/cexts.py
@@ -220,11 +229,7 @@ omdev/pyproject/resources/__init__.py
 omdev/pyproject/resources/docker-dev.sh
 omdev/pyproject/resources/python.sh
 omdev/scripts/__init__.py
-omdev/scripts/bumpversion.py
 omdev/scripts/ci.py
-omdev/scripts/execrss.py
-omdev/scripts/exectime.py
-omdev/scripts/importtrace.py
 omdev/scripts/interp.py
 omdev/scripts/pyproject.py
 omdev/scripts/slowcat.py
@@ -238,11 +243,9 @@ omdev/tools/cloc.py
 omdev/tools/diff.py
 omdev/tools/doc.py
 omdev/tools/docker.py
-omdev/tools/importscan.py
 omdev/tools/intellij.py
 omdev/tools/linehisto.py
 omdev/tools/mkenv.py
-omdev/tools/mkrelimp.py
 omdev/tools/notebook.py
 omdev/tools/pip.py
 omdev/tools/prof.py

{omdev-0.0.0.dev283 → omdev-0.0.0.dev284}/omdev.egg-info/requires.txt

@@ -1,16 +1,15 @@
-omlish==0.0.0.dev283
+omlish==0.0.0.dev284
 
 [all]
 black~=25.1
 pycparser~=2.22
 pcpp~=1.30
 docutils~=0.21
-markdown-it-py~=3.7
+markdown-it-py~=3.0
 mypy~=1.15
-gprof2dot~=2024.6
+gprof2dot~=2025.4
 prompt-toolkit~=3.0
 segno~=1.6
-wheel~=0.45
 
 [black]
 black~=25.1
@@ -21,19 +20,16 @@ pcpp~=1.30
 
 [doc]
 docutils~=0.21
-markdown-it-py~=3.7
+markdown-it-py~=3.0
 
 [mypy]
 mypy~=1.15
 
 [prof]
-gprof2dot~=2024.6
+gprof2dot~=2025.4
 
 [ptk]
 prompt-toolkit~=3.0
 
 [qr]
 segno~=1.6
-
-[wheel]
-wheel~=0.45