omdev 0.0.0.dev98__py3-none-any.whl → 0.0.0.dev100__py3-none-any.whl

omdev/precheck/scripts.py

@@ -3,9 +3,8 @@ import os
 import stat
 import typing as ta
 
-from omdev import findimports
-from omdev import findmagic
-
+from .. import findimports
+from .. import magic
 from .base import Precheck
 from .base import PrecheckContext
 
@@ -22,10 +21,10 @@ class ScriptDepsPrecheck(Precheck['ScriptDepsPrecheck.Config']):
         super().__init__(context, config)
 
     async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
-        for fp in findmagic.find_magic(
+        for fp in magic.find_magic_files(
+                magic.PY_MAGIC_STYLE,
                 self._context.src_roots,
-                ['# @omlish-script'],
-                ['py'],
+                keys=['@omlish-script'],
         ):
             if not (stat.S_IXUSR & os.stat(fp).st_mode):
                 yield Precheck.Violation(self, f'script {fp} is not executable')

omdev/pyproject/pkg.py

@@ -40,7 +40,7 @@ from omlish.lite.logs import log
 from omlish.lite.subprocesses import subprocess_check_call
 
 from ..cexts.magic import CextMagic
-from ..findmagic import find_magic
+from ..magic.find import find_magic_files
 from ..revisions import GitRevisionAdder
 from ..toml.writer import TomlWriter
 
@@ -403,10 +403,10 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
 
     @cached_nullary
     def find_cext_srcs(self) -> ta.Sequence[str]:
-        return sorted(find_magic(
+        return sorted(find_magic_files(
+            CextMagic.STYLE,
             [self._dir_name],
-            [CextMagic.MAGIC_COMMENT],
-            CextMagic.FILE_EXTENSIONS,
+            keys=[CextMagic.KEY],
         ))
 
     #

omdev/scripts/pyproject.py

@@ -99,84 +99,6 @@ UnparsedVersionVar = ta.TypeVar('UnparsedVersionVar', bound=UnparsedVersion)
 CallableVersionOperator = ta.Callable[['Version', str], bool]
 
 
-########################################
-# ../../cexts/magic.py
-
-
-class CextMagic:
-    MAGIC = '@omlish-cext'
-    MAGIC_COMMENT = f'// {MAGIC}'
-
-    FILE_EXTENSIONS = ('c', 'cc', 'cpp')
-
-
-########################################
-# ../../findmagic.py
-
-
-def compile_magic_pat(m: str) -> re.Pattern:
-    return re.compile('^' + re.escape(m) + r'($|(\s.*))')
-
-
-def find_magic(
-        roots: ta.Sequence[str],
-        magics: ta.Sequence[str],
-        exts: ta.Sequence[str],
-        *,
-        py: bool = False,
-) -> ta.Iterator[str]:
-    if isinstance(roots, str):
-        raise TypeError(roots)
-    if isinstance(magics, str):
-        raise TypeError(magics)
-    if isinstance(exts, str):
-        raise TypeError(exts)
-
-    if not magics:
-        raise Exception('Must specify magics')
-    if not exts:
-        raise Exception('Must specify extensions')
-
-    pats = [compile_magic_pat(m) for m in magics]
-
-    for root in roots:
-        for dp, dns, fns in os.walk(root):  # noqa
-            for fn in fns:
-                if not any(fn.endswith(f'.{x}') for x in exts):
-                    continue
-
-                fp = os.path.join(dp, fn)
-                try:
-                    with open(fp) as f:
-                        src = f.read()
-                except UnicodeDecodeError:
-                    continue
-
-                if not any(
-                        any(pat.fullmatch(l) for pat in pats)
-                        for l in src.splitlines()
-                ):
-                    continue
-
-                if py:
-                    if fn == '__init__.py':
-                        out = dp.replace(os.sep, '.')
-                    elif fn.endswith('.py'):
-                        out = fp[:-3].replace(os.sep, '.')
-                    else:
-                        out = fp
-                else:
-                    out = fp
-                yield out
-
-
-# # @omlish-manifest
-# _CLI_MODULE = {'$omdev.cli.types.CliModule': {
-#     'cmd_name': 'py/findmagic',
-#     'mod_name': __name__,
-# }}
-
-
 ########################################
 # ../../git.py
 
@@ -280,6 +202,87 @@ def get_git_revision(
     return dirty_rev + ('-untracked' if has_untracked else '')
 
 
+########################################
+# ../../magic/magic.py
+
+
+@dc.dataclass(frozen=True)
+class Magic:
+    key: str
+
+    file: ta.Optional[str]
+
+    start_line: int
+    end_line: int
+
+    body: str
+
+    prepared: ta.Any
+
+
+########################################
+# ../../magic/prepare.py
+
+
+class MagicPrepareError(Exception):
+    pass
+
+
+def py_compile_magic_preparer(src: str) -> ta.Any:
+    try:
+        prepared = compile(f'({src})', '<magic>', 'eval')
+    except SyntaxError:
+        raise MagicPrepareError  # noqa
+    return prepared
+
+
+def py_eval_magic_preparer(src: str) -> ta.Any:
+    code = py_compile_magic_preparer(src)
+    return eval(code)  # noqa
+
+
+def json_magic_preparer(src: str) -> ta.Any:
+    try:
+        prepared = json.loads(src)
+    except json.JSONDecodeError:
+        raise MagicPrepareError  # noqa
+    return prepared
+
+
+########################################
+# ../../magic/styles.py
+
+
+MAGIC_KEY_PREFIX = '@omlish-'
+
+
+@dc.dataclass(frozen=True)
+class MagicStyle:
+    name: str
+
+    exts: ta.FrozenSet[str] = frozenset()
+
+    key_prefix: str = MAGIC_KEY_PREFIX
+
+    line_prefix: ta.Optional[str] = None
+    block_prefix_suffix: ta.Optional[ta.Tuple[str, str]] = None
+
+
+PY_MAGIC_STYLE = MagicStyle(
+    name='py',
+    exts=frozenset(['py']),
+    line_prefix='# ',
+)
+
+
+C_MAGIC_STYLE = MagicStyle(
+    name='c',
+    exts=frozenset(['c', 'cc', 'cpp']),
+    line_prefix='// ',
+    block_prefix_suffix=('/* ', '*/'),
+)
+
+
 ########################################
 # ../../packaging/versions.py
 # Copyright (c) Donald Stufft and individual contributors.
@@ -2077,6 +2080,241 @@ def format_num_bytes(num_bytes: int) -> str:
     return f'{num_bytes / 1024 ** (len(FORMAT_NUM_BYTES_SUFFIXES) - 1):.2f}{FORMAT_NUM_BYTES_SUFFIXES[-1]}'
 
 
+########################################
+# ../../cexts/magic.py
+
+
+class CextMagic:
+    KEY = '@omlish-cext'
+    STYLE = C_MAGIC_STYLE
+
+
+########################################
+# ../../magic/find.py
+
+
+##
+
+
+def compile_magic_style_pat(
+        style: MagicStyle,
+        *,
+        keys: ta.Optional[ta.Iterable[str]] = None,
+) -> re.Pattern:
+    ps: ta.List[str] = []
+    if style.line_prefix is not None:
+        ps.append(style.line_prefix)
+    if style.block_prefix_suffix is not None:
+        ps.append(style.block_prefix_suffix[0])
+    if not ps:
+        raise Exception('No prefixes')
+
+    ms: ta.List[str] = []
+    if keys is not None:
+        if isinstance(keys, str):
+            raise TypeError(keys)
+        for k in keys:
+            if not k.startswith(style.key_prefix):
+                raise Exception(f'Key does not start with prefix: {k!r} {style.key_prefix!r}')
+            ms.extend([re.escape(p + k) for p in ps])
+    else:
+        ms = [re.escape(p + style.key_prefix) + r'\S*' for p in ps]
+    if not ms:
+        raise Exception('No matchers')
+
+    b = '|'.join(f'({m})' for m in ms)
+    s = '^(' + b + r')($|(\s.*))'
+    return re.compile(s)
+
+
+##
+
+
+def chop_magic_lines(
+        magic_key: str,
+        prefix: str,
+        lines: ta.Iterable[str],
+) -> ta.Optional[ta.List[str]]:
+    out: ta.List[str] = []
+    for i, line in enumerate(lines):
+        if not i:
+            if not line.startswith(prefix + magic_key):
+                return None
+            out.append(line[len(prefix) + len(magic_key) + 1:])
+        else:
+            if not line.startswith(prefix):
+                return None
+            out.append(line[len(prefix):])
+    return out
+
+
+def chop_magic_block(
+        magic_key: str,
+        prefix: str,
+        suffix: str,
+        lines: ta.Iterable[str],
+) -> ta.Optional[ta.List[str]]:
+    out: ta.List[str] = []
+    for i, line in enumerate(lines):
+        if not i:
+            if not line.startswith(prefix + magic_key):
+                return None
+            s = line[len(prefix) + len(magic_key) + 1:]
+            if s.rstrip().endswith(suffix):
+                out.append(s.rstrip()[:-len(suffix)])
+                break
+            out.append(s)
+        elif line.rstrip().endswith(suffix):
+            out.append(line.rstrip()[:-len(suffix)])
+            break
+        else:
+            out.append(line)
+    return out
+
+
+##
+
+
+def find_magic(
+        style: MagicStyle,
+        lines: ta.Sequence[str],
+        *,
+        file: ta.Optional[str] = None,
+        preparer: ta.Callable[[str], ta.Any] = py_compile_magic_preparer,
+) -> ta.List[Magic]:
+    out: ta.List[Magic] = []
+
+    start = 0
+    while start < len(lines):
+        start_line = lines[start]
+
+        chopper: ta.Callable[[ta.Iterable[str]], ta.Optional[ta.List[str]]]
+        if (
+                style.line_prefix is not None and
+                start_line.startswith(style.line_prefix + style.key_prefix)
+        ):
+            key = start_line[len(style.line_prefix):].split()[0]
+            chopper = functools.partial(
+                chop_magic_lines,
+                key,
+                style.line_prefix,
+            )
+
+        elif (
+                style.block_prefix_suffix is not None and
+                start_line.startswith(style.block_prefix_suffix[0] + style.key_prefix)
+        ):
+            key = start_line[len(style.block_prefix_suffix[0]):].split()[0]
+            chopper = functools.partial(
+                chop_magic_block,
+                key,
+                *style.block_prefix_suffix,
+            )
+
+        else:
+            start += 1
+            continue
+
+        end = start
+        magic: ta.Optional[Magic] = None
+        while end < len(lines):
+            block_lines = chopper(lines[start:end + 1])
+            if block_lines is None:
+                raise Exception(f'Failed to find magic block terminator : {file=} {start=} {end=}')
+
+            block_src = ''.join(block_lines)
+            if not block_src:
+                prepared = None
+            else:
+                try:
+                    prepared = preparer(block_src)
+                except MagicPrepareError:
+                    end += 1
+                    continue
+
+            magic = Magic(
+                key=key,
+                file=file,
+                start_line=start + 1,
+                end_line=end + 1,
+                body=block_src,
+                prepared=prepared,
+            )
+            break
+
+        if magic is None:
+            raise Exception(f'Failed to find magic block terminator : {file=} {start=} {end=}')
+
+        out.append(magic)
+        start = end + 1
+
+    return out
+
+
+##
+
+
+def find_magic_files(
+        style: MagicStyle,
+        roots: ta.Sequence[str],
+        *,
+        keys: ta.Optional[ta.Iterable[str]] = None,
+) -> ta.Iterator[str]:
+    if isinstance(roots, str):
+        raise TypeError(roots)
+
+    pat = compile_magic_style_pat(
+        style,
+        keys=keys,
+    )
+
+    for root in roots:
+        for dp, dns, fns in os.walk(root):  # noqa
+            for fn in fns:
+                if not any(fn.endswith(f'.{x}') for x in style.exts):
+                    continue
+
+                fp = os.path.join(dp, fn)
+                try:
+                    with open(fp) as f:
+                        src = f.read()
+                except UnicodeDecodeError:
+                    continue
+
+                if not any(pat.fullmatch(l) for l in src.splitlines()):
+                    continue
+
+                yield fp
+
+
+def find_magic_py_modules(
+        roots: ta.Sequence[str],
+        *,
+        style: MagicStyle = PY_MAGIC_STYLE,
+        **kwargs: ta.Any,
+) -> ta.Iterator[str]:
+    for fp in find_magic_files(style, roots, **kwargs):
+        dp = os.path.dirname(fp)
+        fn = os.path.basename(fp)
+
+        if fn == '__init__.py':
+            yield dp.replace(os.sep, '.')
+        elif fn.endswith('.py'):
+            yield fp[:-3].replace(os.sep, '.')
+        else:
+            yield fp
+
+
+##
+
+
+# # @omlish-manifest
+# _CLI_MODULE = {'$omdev.cli.types.CliModule': {
+#     'cmd_name': 'py/findmagic',
+#     'mod_name': __name__,
+# }}
+
+
 ########################################
 # ../../packaging/specifiers.py
 # Copyright (c) Donald Stufft and individual contributors.
@@ -4162,10 +4400,10 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
 
     @cached_nullary
     def find_cext_srcs(self) -> ta.Sequence[str]:
-        return sorted(find_magic(
+        return sorted(find_magic_files(
+            CextMagic.STYLE,
             [self._dir_name],
-            [CextMagic.MAGIC_COMMENT],
-            CextMagic.FILE_EXTENSIONS,
+            keys=[CextMagic.KEY],
         ))
 
     #

{omdev-0.0.0.dev98.dist-info → omdev-0.0.0.dev100.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev98
+Version: 0.0.0.dev100
 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.dev98
+Requires-Dist: omlish ==0.0.0.dev100
 Provides-Extra: all
 Requires-Dist: black ~=24.10 ; extra == 'all'
 Requires-Dist: pycparser ~=2.22 ; extra == 'all'

{omdev-0.0.0.dev98.dist-info → omdev-0.0.0.dev100.dist-info}/RECORD

@@ -1,11 +1,10 @@
-omdev/.manifests.json,sha256=EyJdfAeMmdF7DSbwubowYqeoe_nnLE5-8VdZh0UuK7w,6781
+omdev/.manifests.json,sha256=nBS0fk7qpXG5VCITHxGUgJgh8Ghd3LyckoYCcfwb8Qc,6713
 omdev/__about__.py,sha256=ON7EnhbxbwLsMj60wkd9OEYPloXZ7jmnMMzeLg44LXY,1225
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
 omdev/classdot.py,sha256=YOvgy6x295I_8NKBbBlRVd3AN7Osirm_Lqt4Wj0j9rY,1631
 omdev/cmake.py,sha256=Diy2ry65806dQP125DAstD3w46z_wszMH7PwC2-6iik,4578
 omdev/findimports.py,sha256=2t8QP852saEEJFeXySEzhi_nxRSxghlkXz2jVdvy08M,2392
-omdev/findmagic.py,sha256=XoKPGjSM0qn1PCiiBPwfTHkpqJYQJmLW8v_4QFJ16Mk,2486
 omdev/git.py,sha256=riM2KqSpQPC3N89uipd7Vm3kVgv4EYYDBU9tV1Z8juM,2208
 omdev/imgur.py,sha256=il12R3t19tALolteYCZywvcdQUEOcgvPyUYgWtKiqt4,2993
 omdev/revisions.py,sha256=U657hf4zeEN32y3g4CzqCAodx_HlfkHj2cIIKALNFDo,5009
@@ -14,7 +13,7 @@ omdev/tokens.py,sha256=GusxQ1Cd_eiScuR8XTTtc9QFhOgYviYGBZmFnn3Hj7s,756
 omdev/wheelfile.py,sha256=yfupGcGkbFlmzGzKU64k_vmOKpaKnUlDWxeGn2KdekU,10005
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/amalg/__main__.py,sha256=h94M-VqZ3AFBU2a8zOsjeKK7RF6uINhTHl6OiGbVMgw,163
-omdev/amalg/amalg.py,sha256=v_4Y9b6eUWUArhIRnTkboe8ZNMr_mHJTWi8GajdDvUs,15139
+omdev/amalg/amalg.py,sha256=b5lo2EZno62_5HbQV-TSMcsLe5ztm4vz3QrJ1-h_ppo,15140
 omdev/antlr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/antlr/consts.py,sha256=8pR6r0m0P3hAiyiAoJZ-nptd2GYbZ98mxwPL9cpaRuw,279
 omdev/antlr/gen.py,sha256=QnPyVWUrJYqHoOc3XsXA8fJdoiwAj6pyUwdG-DVrIeA,2953
@@ -38,10 +37,10 @@ omdev/cache/data/specs.py,sha256=0a9NPJ76Wz69s94KlNbr1Xma3UQ0z2oCAQN7s6uXe4w,249
 omdev/cexts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cexts/_boilerplate.cc,sha256=sbpXEgdFrkdzZXgaNWFFNN27fL9TZu6VrwvMY4-nnFM,1726
 omdev/cexts/build.py,sha256=F3z1-CjDlEM-Gzi5IunKUBO52qdH_pMsFylobTdGJnI,2654
-omdev/cexts/cmake.py,sha256=H-fafsK5TCHAoxOcxvZm83CXFAJl3Gf-nm9GjXfa8SU,9833
+omdev/cexts/cmake.py,sha256=m7Md-mZP252EMa05TZVHRjy8vzhS9tw0nhO1GVQtkQU,9816
 omdev/cexts/importhook.py,sha256=ko0KRxah_ZHhLVcCigYIIDvNHCfHpJ8qhmmuHKbCOt4,3546
-omdev/cexts/magic.py,sha256=FxMfciRvbrcyH-kfQgcAgZL7ekyp5BdkyQ5IC9YjFzo,136
-omdev/cexts/scan.py,sha256=_U5DX9ksHP1845PdGxWh4Rf1a6x_sG1MH3uL_hwBnKY,1669
+omdev/cexts/magic.py,sha256=MPmdhGANFVRaA3351BSTBrXm214dWXro1RMRHaJ2_O0,126
+omdev/cexts/scan.py,sha256=fTDy4DKgGQHdyf2Pp80Z_Ra5o984jFF9LeKfJm39IyM,1665
 omdev/cexts/_distutils/LICENSE,sha256=22p14FIRp3F4Cb7Mj_GK33PKr25issFGHC2JN6dg9vc,1023
 omdev/cexts/_distutils/__init__.py,sha256=c1zImtnPh3uY8BUTV4RLKtGKqTPx3c_pBbhA6tPtNsE,297
 omdev/cexts/_distutils/build_ext.py,sha256=STHl9Rq2KeWJ3dQ8j8LwIQ-vFc4-3XsYWQ8Qc5_VByU,13833
@@ -79,8 +78,13 @@ omdev/interp/resolvers.py,sha256=tpzlmqGp1C4QKdA6TfcPmtmaygu7mb6WK2RPSbyNQ6s,302
 omdev/interp/standalone.py,sha256=XcltiL7ypcfV89C82_3knQ3Kx7aW4wnnxf2056ZXC3A,7731
 omdev/interp/system.py,sha256=bI-JhX4GVJqW7wMxnIa-DGJWnCLmFcIsnl9pc1RGY2g,3513
 omdev/interp/types.py,sha256=EMN3StEMkFoQAMUIZd7JYL4uUWqzFGY-2hTL8EBznYM,2437
+omdev/magic/__init__.py,sha256=CBzRB71RLyylkrj8dph6JUEddA8KSMJvDgriHqFfJGU,478
+omdev/magic/find.py,sha256=tTmpWXAleaXG3_kNOsRF7s8D0CpYMXbdz6-HbCNBW90,7070
+omdev/magic/magic.py,sha256=h1nxoW6CV1MRCiHjDt3sO4kmG0qTtTRbkDNiPLGo2BE,224
+omdev/magic/prepare.py,sha256=V5jYT2AeFmazzPwk9sNismSouLwFXEoik6FwKcWCNUY,589
+omdev/magic/styles.py,sha256=YZrLend-O5-7TKrIu4Ukxk1q0I2yaQtxwa6tn7TRbJM,599
 omdev/manifests/__init__.py,sha256=P2B0dpT8D7l5lJwRGPA92IcQj6oeXfd90X5-q9BJrKg,51
-omdev/manifests/build.py,sha256=omRyKmj4NhZ6PrhmoJIKYCTYaU1OB7bZEtfso29hIEo,10831
+omdev/manifests/build.py,sha256=E7BelbrJEJes-BEbAUZCVLVs79sYuC0fbthgXAoxaOk,10865
 omdev/manifests/load.py,sha256=LtEsluDdd8CkNGj0QGBxee3twBn095Fru0xz2mtr7uk,4788
 omdev/manifests/types.py,sha256=Jv6PAdVLPb9Hh4y6vDhPlWuMNBBViin1bC_u83jfsH4,234
 omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -94,10 +98,10 @@ omdev/precheck/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/precheck/__main__.py,sha256=UEuS4z5-heIrwTtB-ONe1KeXJdqj8tYXMqWMpuO10so,165
 omdev/precheck/base.py,sha256=a_lGoFM-QhL8u8XDUYFhb-feEyfPbP4j8lcmNO51sHY,732
 omdev/precheck/git.py,sha256=APC5Ln7x0zDrQiGPRWPsBcVJK3vWhbU-brqR5M63JQA,849
-omdev/precheck/lite.py,sha256=d8D-BY-Z0rqQigQ_aR9QXxdB3EBCHJc7WgBJngGiEiE,3871
+omdev/precheck/lite.py,sha256=z99pgTO4SAmLEqSj6qaKd4hcs0WpwixYkQZn75lZRX8,3883
 omdev/precheck/main.py,sha256=2YizDZSDhMeQaZKVH83s99pBmtOUL9B-8dXwIcw6fQQ,2674
 omdev/precheck/manifests.py,sha256=YfXqt6u0hlFXY0QkBMec6V_6Y9T4eCVAmrJDkQkB13U,774
-omdev/precheck/scripts.py,sha256=qq6MXkxgrYngPg5pWnXH4uRSuRkP3mFqbeml1UmvGBc,1265
+omdev/precheck/scripts.py,sha256=Xw9kkQzlDd_2V9av9qlaNpNZG9jZdy3TTo7x60MeR2I,1273
 omdev/ptk/__init__.py,sha256=StAwXQ96e8Xkkg7ciR9oBBhcSgqHT76vhoZML82BuY0,447
 omdev/ptk/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/ptk/apps/ncdu.py,sha256=ov6AEjne2NyVE45XiAtteq5SmbxXHQkUsybuu5KSwRQ,4479
@@ -106,7 +110,7 @@ omdev/pyproject/__main__.py,sha256=gn3Rl1aYPYdiTtEqa9ifi0t-e4ZwPY0vhJ4UXvYdJDY,1
 omdev/pyproject/cexts.py,sha256=x13piOOnNrYbA17qZLDVuR0p1sqhgEwpk4FtImX-klM,4281
 omdev/pyproject/cli.py,sha256=kw0Jyzywwt6QOc6QHDevWW9p85aXT7jvVFFb8Sb_EAU,11365
 omdev/pyproject/configs.py,sha256=K9H5cGwVLgHi8wKwtYvlXHZ9ThtmnI4jo8JAb-t1-70,2859
-omdev/pyproject/pkg.py,sha256=rNKzJOIgPDrtT2i14Pebldoboz45w00sKb5l_kYFaRI,14562
+omdev/pyproject/pkg.py,sha256=WB9k3zEpHSAR24H09kikgAnLMWUz-bk9f0aB-2L_ITw,14560
 omdev/pyproject/reqs.py,sha256=8feZ71YnGzwKbLK4zO28CDQeNcZIIuq6cnkBhs6M-7E,2406
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
 omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,1064
@@ -114,27 +118,27 @@ omdev/scripts/execrss.py,sha256=hJTWBig_-XqKIj1DphYTfeVDtdQTM1XUl-Hvzs2x9iY,451
 omdev/scripts/exectime.py,sha256=dBdn3KV2jR6tCrzGvb9dTl2uGe2vNpLxmHMtExmnaiM,410
 omdev/scripts/importtrace.py,sha256=Jbo3Yk2RAbE8_tJ97iTcVNpoxCJxrRb2tl1W_CV3NG0,14067
 omdev/scripts/interp.py,sha256=ls04OE3g_TpiK5_inRfOzUvBGUtBgSt5vnkqC3eZhTM,72076
-omdev/scripts/pyproject.py,sha256=g5f0AyRii_DSY-D6mMDUVqKNPNxWXAQJoWrYi1F2KGM,158772
+omdev/scripts/pyproject.py,sha256=0etqlpe2wL2lRLKgRo6X5llzpvM-I7AHbu1oWqdV-6M,164318
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/toml/parser.py,sha256=84bn09uhYHwQGyfww6Rw6y1RxPAE_HDltODOSakcqDM,29186
 omdev/toml/writer.py,sha256=lk3on3YXVbWuLJa-xsOzOhs1bBAT1vXqw4mBbluZl_w,3040
 omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
-omdev/tools/dockertools.py,sha256=k2BrVvFYwyGov064CPHd_HWo9aqR1zHc2UeEsVwPth4,6827
-omdev/tools/doctools.py,sha256=mv9XfitzqXl3vFHSenv01xHCxWf8g03rUAb_sqoty98,2556
-omdev/tools/gittools.py,sha256=1Oa2AgdZIJZ2eusso9yFzkd9zLWH3d4lTiVFzwg0uDM,3808
+omdev/tools/doc.py,sha256=mv9XfitzqXl3vFHSenv01xHCxWf8g03rUAb_sqoty98,2556
+omdev/tools/docker.py,sha256=k2BrVvFYwyGov064CPHd_HWo9aqR1zHc2UeEsVwPth4,6827
+omdev/tools/git.py,sha256=1Oa2AgdZIJZ2eusso9yFzkd9zLWH3d4lTiVFzwg0uDM,3808
 omdev/tools/importscan.py,sha256=QeGjR3UGcuuuDUiisFuAXWHlcKJScGxGEcU6tfOh2CM,4069
 omdev/tools/mkrelimp.py,sha256=wsJAjTIf3nqcSfnT9TkDpS1VUOoM9W2Az5tZdWuzyLM,4054
-omdev/tools/nbtools.py,sha256=M8Xi_gfZdlahnyFLtp0RBgYZPSHWQStMMDYZc71Zync,3494
-omdev/tools/piptools.py,sha256=-jR5q3w4sHqntxCLExFCBNIARB788FUsAbJ62PK2sBU,2774
-omdev/tools/proftools.py,sha256=8ZU9x_Dq8eT2ZFwU9sJpDIvxcIn9qBc8y2ELKPb5e5M,1382
+omdev/tools/notebook.py,sha256=M8Xi_gfZdlahnyFLtp0RBgYZPSHWQStMMDYZc71Zync,3494
+omdev/tools/pip.py,sha256=-jR5q3w4sHqntxCLExFCBNIARB788FUsAbJ62PK2sBU,2774
+omdev/tools/prof.py,sha256=8ZU9x_Dq8eT2ZFwU9sJpDIvxcIn9qBc8y2ELKPb5e5M,1382
 omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=Eckymn22GfychCQcQi96BFqRo_LmiJ-EPhC8TTUJdB4,11446
-omdev-0.0.0.dev98.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev98.dist-info/METADATA,sha256=iTM12k8q9OTLBHP1Ed0J-xxukNVE65PUwPPCoOOOV9M,1702
-omdev-0.0.0.dev98.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-omdev-0.0.0.dev98.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev98.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev98.dist-info/RECORD,,
+omdev-0.0.0.dev100.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev100.dist-info/METADATA,sha256=jBN-gpjo8p3RwVShev6g75Sg2bNhC4oAAfL5Nj-Pqm0,1704
+omdev-0.0.0.dev100.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+omdev-0.0.0.dev100.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev100.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev100.dist-info/RECORD,,