omdev 0.0.0.dev11__py3-none-any.whl → 0.0.0.dev13__py3-none-any.whl

omdev/__about__.py

@@ -13,17 +13,21 @@ class Project(ProjectBase):
 
     optional_dependencies = {
         'c': [
-            'pycparser >= 2.22',
-            'cffi >= 1.17',
-            'pcpp >= 1.30',
+            'pycparser ~= 2.22',
+            'cffi ~= 1.17',
+            'pcpp ~= 1.30',
         ],
 
         'mypy': [
-            'mypy >= 1.11',
+            'mypy ~= 1.11',
         ],
 
         'tokens': [
-            'tokenize_rt >= 6',
+            'tokenize_rt ~= 6.0',
+        ],
+
+        'wheel': [
+            'wheel ~= 0.44',
         ],
     }
 

omdev/amalg/amalg.py

@@ -363,13 +363,25 @@ def gen_amalg(
 
     ##
 
+    tyd: dict[str, list[Typing]] = {}
     tys = set()
     for sf in sfs:
         f = src_files[sf]
         for ty in f.typings:
             if ty.src not in tys:
-                out.write(ty.src)
+                tyd.setdefault(f.path, []).append(ty)
                 tys.add(ty.src)
+    for i, (sf, ftys) in enumerate(tyd.items()):
+        f = src_files[sf]
+        if i:
+            out.write('\n')
+        if f is not mf:
+            rp = os.path.relpath(f.path, mf.path)
+        else:
+            rp = os.path.basename(f.path)
+        out.write(f'# {rp}\n')
+        for ty in ftys:
+            out.write(ty.src)
     if tys:
         out.write('\n\n')
 

omdev/cmake.py

@@ -1,5 +1,4 @@
 import abc
-import io
 import typing as ta
 
 from omlish import dataclasses as dc
@@ -80,7 +79,7 @@ class CmakeGen:
 
     def __init__(
             self,
-            out: io.TextIOBase,
+            out: ta.TextIO,
             *,
             indent: int = 4,
     ) -> None:

omdev/exts/cmake.py

@@ -9,6 +9,7 @@ TODO:
    - json? https://github.com/nlohmann/json
   - FindPackages? FetchContent? built_ext won't have that
   - move omml git / data retriever stuff into omdev, get just the one header file from git via sha?
+ - support local built pys 
 
 ==
 
@@ -17,191 +18,324 @@ Done:
   - aight, generate a whole cmake subdir with symlinks to src files lol
 
 """  # noqa
+import argparse
+import dataclasses as dc
 import io
 import logging
 import os.path
 import shutil
 import sys
 import sysconfig
+import typing as ta
 
 from omlish import check
+from omlish import lang
 from omlish import logs
 
 from .. import cmake
+from ..scripts import findmagic
 
 
 log = logging.getLogger(__name__)
 
 
-def _main() -> None:
-    logs.configure_standard_logging('INFO')
+##
+
+
+MAGIC = '@omdev-ext'
+MAGIC_COMMENT = f'// {MAGIC}'
+
+FILE_EXTENSIONS = ('c', 'cc', 'cpp')
+
+
+def _sep_str_grps(*ls: ta.Sequence[str]) -> list[str]:
+    o = []
+    for i, l in enumerate(ls):
+        if not l:
+            continue
+        if i:
+            o.append('')
+        o.extend(check.not_isinstance(l, str))
+    return o
+
+
+class CmakeProjectGen:
+    def __init__(
+            self,
+            exts: ta.Sequence[str],
+            prj_root: str | None = None,
+    ) -> None:
+        super().__init__()
+        self._exts = check.not_isinstance(exts, str)
+        self._prj_root = os.path.abspath(prj_root) if prj_root is not None else os.getcwd()
+
+    #
+
+    @property
+    def prj_root(self) -> str:
+        return self._prj_root
+
+    @lang.cached_function
+    def prj_name(self) -> str:
+        return os.path.basename(self.prj_root)
+
+    @lang.cached_function
+    def cmake_dir(self) -> str:
+        cmake_dir = os.path.join(self.prj_root, 'cmake')
+        if os.path.exists(cmake_dir):
+            for e in os.listdir(cmake_dir):
+                if e == '.idea':
+                    continue
+                ep = os.path.join(cmake_dir, e)
+                if os.path.isfile(ep):
+                    os.unlink(ep)
+                else:
+                    shutil.rmtree(ep)
+        else:
+            os.mkdir(cmake_dir)
+        return cmake_dir
+
+    #
+
+    def write_git_ignore(self) -> None:
+        with open(os.path.join(self.cmake_dir(), '.gitignore'), 'w') as f:
+            f.write('\n'.join(sorted(['/cmake-*', '/build'])))
+
+    #
+
+    def write_idea_name(self) -> None:
+        idea_dir = os.path.join(self.cmake_dir(), '.idea')
+        if not os.path.isdir(idea_dir):
+            os.mkdir(idea_dir)
+        idea_name_file = os.path.join(idea_dir, '.name')
+        if not os.path.isfile(idea_name_file):
+            with open(idea_name_file, 'w') as f:
+                f.write(self.prj_name())
 
-    prj_root = os.path.abspath(os.getcwd())
-    if not os.path.isfile(os.path.join(prj_root, 'pyproject.toml')):
-        raise Exception('Must be run in project root')
-
-    cmake_dir = os.path.join(prj_root, 'cmake')
-    if os.path.exists(cmake_dir):
-        for e in os.listdir(cmake_dir):
-            if e == '.idea':
-                continue
-            ep = os.path.join(cmake_dir, e)
-            if os.path.isfile(ep):
-                os.unlink(ep)
+    #
+
+    @dc.dataclass(frozen=True, kw_only=True)
+    class PyInfo:
+        venv_exe: str
+        venv_root: str
+        real_exe: str
+        root: str
+        suffix: str
+
+    @lang.cached_function
+    def py_info(self) -> PyInfo:
+        venv_exe = sys.executable
+        real_exe = os.path.realpath(venv_exe)
+        return self.PyInfo(
+            venv_exe=venv_exe,
+            venv_root=os.path.abspath(os.path.join(os.path.dirname(venv_exe), '..')),
+            real_exe=real_exe,
+            root=os.path.abspath(os.path.join(os.path.dirname(real_exe), '..')),
+            suffix='.'.join(map(str, sys.version_info[:2])),
+        )
+
+    #
+
+    @lang.cached_function
+    def ext_files(self) -> ta.Sequence[str]:
+        out = []
+        for e in self._exts:
+            e = os.path.abspath(e)
+            if os.path.isfile(e):
+                out.append(e)
+            elif os.path.isdir(e):
+                out.extend(
+                    findmagic.find_magic(
+                        [e],
+                        [MAGIC_COMMENT],
+                        FILE_EXTENSIONS,
+                    ),
+                )
             else:
-                shutil.rmtree(ep)
-    else:
-        os.mkdir(cmake_dir)
-
-    with open(os.path.join(cmake_dir, '.gitignore'), 'w') as f:
-        f.write('\n'.join(sorted(['/cmake-*', '/build'])))
-
-    # idea_dir = os.path.join(cmake_dir, '.idea')
-    # if not os.path.isdir(idea_dir):
-    #     os.mkdir(idea_dir)
-    # idea_name_file = os.path.join(idea_dir, '.name')
-    # if not os.path.isfile(idea_name_file):
-    #     with open(idea_name_file, 'w') as f:
-    #         f.write('omlish')
-
-    venv_exe = sys.executable
-    venv_root = os.path.abspath(os.path.join(os.path.dirname(venv_exe), '..'))
-    real_exe = os.path.realpath(venv_exe)
-    py_root = os.path.abspath(os.path.join(os.path.dirname(real_exe), '..'))
-    py_sfx = '.'.join(map(str, sys.version_info[:2]))
-
-    out = io.StringIO()
-    gen = cmake.CmakeGen(out)
-
-    prj_name = 'omlish'
-    var_prefix = prj_name.upper()
-
-    gen.write(gen.preamble)
-    gen.write('')
-
-    gen.write(f'project({prj_name})')
-    gen.write('')
-
-    def sep_grps(*ls):
-        # itertools.interleave? or smth?
-        o = []
-        for i, l in enumerate(ls):
-            if not l:
-                continue
-            if i:
-                o.append('')
-            o.extend(check.not_isinstance(l, str))
-        return o
-
-    gen.write_var(cmake.Var(
-        f'{var_prefix}_INCLUDE_DIRECTORIES',
-        sep_grps(
-            [f'{venv_root}/include'],
-            [f'{py_root}/include/python{py_sfx}'],
-            [
-                # $ENV{HOME}/src/python/cpython
-                # $ENV{HOME}/src/python/cpython/include
-            ],
-        ),
-    ))
-
-    gen.write_var(cmake.Var(
-        f'{var_prefix}_COMPILE_OPTIONS',
-        sep_grps(
-            [
-                '-Wsign-compare',
-                '-Wunreachable-code',
-                '-DNDEBUG',
-                '-g',
-                '-fwrapv',
-                '-O3',
-                '-Wall',
-            ],
-            [
-                '-g',
-                '-c',
-            ],
-            ['-std=c++20'],
-        ),
-    ))
-
-    gen.write_var(cmake.Var(
-        f'{var_prefix}_LINK_DIRECTORIES',
-        sep_grps(
-            [f'{py_root}/lib'],
-            # ['$ENV{HOME}/src/python/cpython'],
-        ),
-    ))
-
-    gen.write_var(cmake.Var(
-        f'{var_prefix}_LINK_LIBRARIES',
-        sep_grps(
-            *([[
-                '-bundle',
-                '"-undefined dynamic_lookup"',
-            ]] if sys.platform == 'darwin' else []),
-        ),
-    ))
-
-    for ext_src in [
-        'omdev/exts/_boilerplate.cc',
-        'x/dev/c/junk.cc',
-        'x/dev/c/_uuid.cc',
-        'x/dev/c/csv/_csvloader.cc',
-    ]:
-        ext_name = ext_src.rpartition('.')[0].replace('/', '__')
-
-        log.info('Adding cmake c extension: %s -> %s', ext_src, ext_name)
-
-        so_name = ''.join([
-            os.path.basename(ext_src).split('.')[0],
-            '.',
-            sysconfig.get_config_var('SOABI'),
-            sysconfig.get_config_var('SHLIB_SUFFIX'),
-        ])
-
-        sl = os.path.join(cmake_dir, ext_src)
-        sal = os.path.abspath(sl)
-        sd = os.path.dirname(sal)
-        os.makedirs(sd, exist_ok=True)
-        rp = os.path.relpath(os.path.abspath(ext_src), sd)
-        os.symlink(rp, sal)
-
-        gen.write_target(cmake.ModuleLibrary(
-            ext_name,
-            src_files=[
-                sl,
-            ],
-            include_dirs=[
-                f'${{{var_prefix}_INCLUDE_DIRECTORIES}}',
-            ],
-            compile_opts=[
-                f'${{{var_prefix}_COMPILE_OPTIONS}}',
-            ],
-            link_dirs=[
-                f'${{{var_prefix}_LINK_DIRECTORIES}}',
-            ],
-            link_libs=[
-                f'${{{var_prefix}_LINK_LIBRARIES}}',
-            ],
-            extra_cmds=[
-                cmake.Command(
-                    'add_custom_command',
-                    ['TARGET', ext_name, 'POST_BUILD'],
+                raise KeyError(e)
+        return out
+
+    #
+
+    class _CmakeListsGen:
+        def __init__(
+                self,
+                p: 'CmakeProjectGen',
+                out: ta.TextIO,
+        ) -> None:
+            super().__init__()
+            self.p = p
+            self.g = cmake.CmakeGen(out)
+
+        @lang.cached_property
+        def var_prefix(self) -> str:
+            return self.p.prj_name().upper()
+
+        @lang.cached_property
+        def py(self) -> 'CmakeProjectGen.PyInfo':
+            return self.p.py_info()
+
+        def _add_ext(self, ext_src: str) -> None:
+            ext_name = ext_src.rpartition('.')[0].replace('/', '__')
+
+            log.info('Adding cmake c extension: %s -> %s', ext_src, ext_name)
+
+            so_name = ''.join([
+                os.path.basename(ext_src).split('.')[0],
+                '.',
+                sysconfig.get_config_var('SOABI'),
+                sysconfig.get_config_var('SHLIB_SUFFIX'),
+            ])
+
+            sl = os.path.join(self.p.cmake_dir(), ext_src)
+            sal = os.path.abspath(sl)
+            sd = os.path.dirname(sal)
+            os.makedirs(sd, exist_ok=True)
+            rp = os.path.relpath(os.path.abspath(ext_src), sd)
+            os.symlink(rp, sal)
+
+            ml = cmake.ModuleLibrary(
+                ext_name,
+                src_files=[
+                    sl,
+                ],
+                include_dirs=[
+                    f'${{{self.var_prefix}_INCLUDE_DIRECTORIES}}',
+                ],
+                compile_opts=[
+                    f'${{{self.var_prefix}_COMPILE_OPTIONS}}',
+                ],
+                link_dirs=[
+                    f'${{{self.var_prefix}_LINK_DIRECTORIES}}',
+                ],
+                link_libs=[
+                    f'${{{self.var_prefix}_LINK_LIBRARIES}}',
+                ],
+                extra_cmds=[
+                    cmake.Command(
+                        'add_custom_command',
+                        ['TARGET', ext_name, 'POST_BUILD'],
+                        [
+                            ' '.join([
+                                'COMMAND ${CMAKE_COMMAND} -E ',
+                                f'copy $<TARGET_FILE_NAME:{ext_name}> ../../{os.path.dirname(ext_src)}/{so_name}',
+                            ]),
+                            'COMMAND_EXPAND_LISTS',
+                        ],
+                    ),
+                ],
+            )
+            self.g.write_target(ml)
+
+        def run(self) -> None:
+            self.g.write(self.g.preamble)
+            self.g.write('')
+
+            self.g.write(f'project({self.p.prj_name()})')
+            self.g.write('')
+
+            self.g.write_var(cmake.Var(
+                f'{self.var_prefix}_INCLUDE_DIRECTORIES',
+                _sep_str_grps(
+                    [f'{self.py.venv_root}/include'],
+                    [f'{self.py.root}/include/python{self.py.suffix}'],
+                    [
+                        # $ENV{HOME}/src/python/cpython
+                        # $ENV{HOME}/src/python/cpython/include
+                    ],
+                ),
+            ))
+
+            self.g.write_var(cmake.Var(
+                f'{self.var_prefix}_COMPILE_OPTIONS',
+                _sep_str_grps(
+                    [
+                        '-Wsign-compare',
+                        '-Wunreachable-code',
+                        '-DNDEBUG',
+                        '-g',
+                        '-fwrapv',
+                        '-O3',
+                        '-Wall',
+                    ],
                     [
-                        ' '.join([
-                            'COMMAND ${CMAKE_COMMAND} -E ',
-                            f'copy $<TARGET_FILE_NAME:{ext_name}> ../../{os.path.dirname(ext_src)}/{so_name}',
-                        ]),
-                        'COMMAND_EXPAND_LISTS',
+                        '-g',
+                        '-c',
                     ],
+                    ['-std=c++20'],
+                ),
+            ))
+
+            self.g.write_var(cmake.Var(
+                f'{self.var_prefix}_LINK_DIRECTORIES',
+                _sep_str_grps(
+                    [f'{self.py.root}/lib'],
+                    # ['$ENV{HOME}/src/python/cpython'],
+                ),
+            ))
+
+            self.g.write_var(cmake.Var(
+                f'{self.var_prefix}_LINK_LIBRARIES',
+                _sep_str_grps(
+                    *([[
+                        '-bundle',
+                        '"-undefined dynamic_lookup"',
+                    ]] if sys.platform == 'darwin' else []),
                 ),
-            ],
-        ))
+            ))
+
+            for ext_src in self.p.ext_files():
+                self._add_ext(os.path.relpath(ext_src, self.p.prj_root))
+
+    #
+
+    def run(self) -> None:
+        if not os.path.isfile(os.path.join(self._prj_root, 'pyproject.toml')):
+            raise Exception('Must be run in project root')
+
+        self.ext_files()
+
+        log.info('Generating cmake project %s', self.prj_name())
 
-    # print(out.getvalue())
-    with open(os.path.join(cmake_dir, 'CMakeLists.txt'), 'w') as f:
-        f.write(out.getvalue())
+        self.cmake_dir()
+        self.write_git_ignore()
+        self.write_idea_name()
+
+        out = io.StringIO()
+        clg = self._CmakeListsGen(self, out)
+        clg.run()
+
+        with open(os.path.join(self.cmake_dir(), 'CMakeLists.txt'), 'w') as f:
+            f.write(out.getvalue())
+
+
+##
+
+
+def _gen_cmd(args) -> None:
+    if not args.exts:
+        raise Exception('must specify exts')
+
+    cpg = CmakeProjectGen(args.exts)
+    cpg.run()
+
+
+def _main(argv=None) -> None:
+    logs.configure_standard_logging('INFO')
+
+    parser = argparse.ArgumentParser()
+
+    subparsers = parser.add_subparsers()
+
+    parser_gen = subparsers.add_parser('gen')
+    parser_gen.add_argument('exts', nargs='*')
+    parser_gen.set_defaults(func=_gen_cmd)
+
+    args = parser.parse_args(argv)
+    if not getattr(args, 'func', None):
+        parser.print_help()
+    else:
+        args.func(args)
 
 
 if __name__ == '__main__':

omdev/exts/scan.py

@@ -12,7 +12,7 @@ log = logging.getLogger(__name__)
 SCAN_COMMENT = '// @omdev-ext'
 
 
-def _scan_one(
+def scan_one(
         input_path: str,
         **kwargs: ta.Any,
 ) -> None:
@@ -42,7 +42,7 @@ def _scan_cmd(args) -> None:
         log.info('Scanning %s', i)
         for we_dirpath, we_dirnames, we_filenames in os.walk(i):  # noqa
             for fname in we_filenames:
-                _scan_one(
+                scan_one(
                     os.path.abspath(os.path.join(we_dirpath, fname)),
                 )
 

omdev/scripts/findmagic.py

@@ -28,8 +28,11 @@ def find_magic(
                     continue
 
                 fp = os.path.join(dp, fn)
-                with open(fp) as f:
-                    src = f.read()
+                try:
+                    with open(fp) as f:
+                        src = f.read()
+                except UnicodeDecodeError:
+                    continue
 
                 if not any(
                         any(pat.fullmatch(l) for pat in pats)

omdev/scripts/interp.py

@@ -29,13 +29,18 @@ import threading
 import typing as ta
 
 
+# ../../versioning/versions.py
 VersionLocalType = ta.Tuple[ta.Union[int, str], ...]
 VersionCmpPrePostDevType = ta.Union['InfinityVersionType', 'NegativeInfinityVersionType', ta.Tuple[str, int]]
 _VersionCmpLocalType0 = ta.Tuple[ta.Union[ta.Tuple[int, str], ta.Tuple['NegativeInfinityVersionType', ta.Union[int, str]]], ...]  # noqa
 VersionCmpLocalType = ta.Union['NegativeInfinityVersionType', _VersionCmpLocalType0]
 VersionCmpKey = ta.Tuple[int, ta.Tuple[int, ...], VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpLocalType]  # noqa
 VersionComparisonMethod = ta.Callable[[VersionCmpKey, VersionCmpKey], bool]
+
+# ../../../omlish/lite/check.py
 T = ta.TypeVar('T')
+
+# ../../versioning/specifiers.py
 UnparsedVersion = ta.Union['Version', str]
 UnparsedVersionVar = ta.TypeVar('UnparsedVersionVar', bound=UnparsedVersion)
 CallableVersionOperator = ta.Callable[['Version', str], bool]

omdev/scripts/pyproject.py

@@ -55,16 +55,23 @@ import uuid
 import weakref  # noqa
 
 
+# ../../toml/parser.py
 TomlParseFloat = ta.Callable[[str], ta.Any]
 TomlKey = ta.Tuple[str, ...]
 TomlPos = int  # ta.TypeAlias
+
+# ../../versioning/versions.py
 VersionLocalType = ta.Tuple[ta.Union[int, str], ...]
 VersionCmpPrePostDevType = ta.Union['InfinityVersionType', 'NegativeInfinityVersionType', ta.Tuple[str, int]]
 _VersionCmpLocalType0 = ta.Tuple[ta.Union[ta.Tuple[int, str], ta.Tuple['NegativeInfinityVersionType', ta.Union[int, str]]], ...]  # noqa
 VersionCmpLocalType = ta.Union['NegativeInfinityVersionType', _VersionCmpLocalType0]
 VersionCmpKey = ta.Tuple[int, ta.Tuple[int, ...], VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpLocalType]  # noqa
 VersionComparisonMethod = ta.Callable[[VersionCmpKey, VersionCmpKey], bool]
+
+# ../../../omlish/lite/check.py
 T = ta.TypeVar('T')
+
+# ../../versioning/specifiers.py
 UnparsedVersion = ta.Union['Version', str]
 UnparsedVersionVar = ta.TypeVar('UnparsedVersionVar', bound=UnparsedVersion)
 CallableVersionOperator = ta.Callable[['Version', str], bool]

omdev/tools/revisions.py

@@ -0,0 +1,173 @@
+"""
+TODO:
+ - omlish-lite, move to pyproject/
+  - vendor-lite wheel.wheelfile
+"""
+# ruff: noqa: TCH003 UP006 UP007
+# @omlish-lite
+import argparse
+import io
+import os.path
+import subprocess
+import tarfile
+import typing as ta
+import zipfile
+
+from omlish.lite.logs import configure_standard_logging
+from omlish.lite.logs import log
+
+from ..wheelfile import WheelFile
+
+
+class RevisionAdder:
+    def __init__(
+            self,
+            revision: str,
+            output_suffix: ta.Optional[str] = None,
+    ) -> None:
+        super().__init__()
+        self._revision = revision
+        self._output_suffix = output_suffix
+
+    REVISION_ATTR = '__revision__'
+
+    def add_to_contents(self, dct: ta.Dict[str, bytes]) -> bool:
+        changed = False
+        for n in dct:
+            if not n.endswith('__about__.py'):
+                continue
+            src = dct[n].decode('utf-8')
+            lines = src.splitlines(keepends=True)
+            for i, l in enumerate(lines):
+                if l != f'{self.REVISION_ATTR} = None\n':
+                    continue
+                lines[i] = f"{self.REVISION_ATTR} = '{self._revision}'\n"
+                changed = True
+            dct[n] = ''.join(lines).encode('utf-8')
+        return changed
+
+    def add_to_wheel(self, f: str) -> None:
+        if not f.endswith('.whl'):
+            raise Exception(f)
+        log.info('Scanning wheel %s', f)
+
+        zis: ta.Dict[str, zipfile.ZipInfo] = {}
+        dct: ta.Dict[str, bytes] = {}
+        with WheelFile(f) as wf:
+            for zi in wf.filelist:
+                if zi.filename == wf.record_path:
+                    continue
+                zis[zi.filename] = zi
+                dct[zi.filename] = wf.read(zi.filename)
+
+        if self.add_to_contents(dct):
+            of = f[:-4] + (self._output_suffix or '') + '.whl'
+            log.info('Repacking wheel %s', of)
+            with WheelFile(of, 'w') as wf:
+                for n, d in dct.items():
+                    log.info('Adding zipinfo %s', n)
+                    wf.writestr(zis[n], d)
+
+    def add_to_tgz(self, f: str) -> None:
+        if not f.endswith('.tar.gz'):
+            raise Exception(f)
+        log.info('Scanning tgz %s', f)
+
+        tis: ta.Dict[str, tarfile.TarInfo] = {}
+        dct: ta.Dict[str, bytes] = {}
+        with tarfile.open(f, 'r:gz') as tf:
+            for ti in tf:
+                tis[ti.name] = ti
+                if ti.type == tarfile.REGTYPE:
+                    with tf.extractfile(ti.name) as tif:  # type: ignore
+                        dct[ti.name] = tif.read()
+
+        if self.add_to_contents(dct):
+            of = f[:-7] + (self._output_suffix or '') + '.tar.gz'
+            log.info('Repacking tgz %s', of)
+            with tarfile.open(of, 'w:gz') as tf:
+                for n, ti in tis.items():
+                    log.info('Adding tarinfo %s', n)
+                    if n in dct:
+                        data = dct[n]
+                        ti.size = len(data)
+                        fo = io.BytesIO(data)
+                    else:
+                        fo = None
+                    tf.addfile(ti, fileobj=fo)
+
+    EXTS = ('.tar.gz', '.whl')
+
+    def add_to_file(self, f: str) -> None:
+        if f.endswith('.whl'):
+            self.add_to_wheel(f)
+
+        elif f.endswith('.tar.gz'):
+            self.add_to_tgz(f)
+
+    def add_to(self, tgt: str) -> None:
+        if os.path.isfile(tgt):
+            self.add_to_file(tgt)
+
+        elif os.path.isdir(tgt):
+            for dp, dns, fns in os.walk(tgt):  # noqa
+                for f in fns:
+                    if any(f.endswith(ext) for ext in self.EXTS):
+                        self.add_to_file(os.path.join(dp, f))
+
+
+#
+
+
+def get_revision() -> str:
+    return subprocess.check_output([
+        'git',
+        'describe',
+        '--match=NeVeRmAtCh',
+        '--always',
+        '--abbrev=40',
+        '--dirty',
+    ]).decode().strip()
+
+
+#
+
+
+def _add_cmd(args) -> None:
+    if (revision := args.revision) is None:
+        revision = get_revision()
+        log.info('Using revision %s', revision)
+
+    if not args.targets:
+        raise Exception('must specify targets')
+
+    ra = RevisionAdder(
+        revision,
+        output_suffix=args.suffix,
+    )
+    for tgt in args.targets:
+        ra.add_to(tgt)
+
+
+def _main(argv=None) -> None:
+    configure_standard_logging('INFO')
+
+    parser = argparse.ArgumentParser()
+
+    subparsers = parser.add_subparsers()
+
+    parser_add = subparsers.add_parser('add')
+    parser_add.add_argument('-r', '--revision')
+    parser_add.add_argument('-s', '--suffix')
+    parser_add.add_argument('targets', nargs='*')
+    parser_add.set_defaults(func=_add_cmd)
+
+    args = parser.parse_args(argv)
+    if not getattr(args, 'func', None):
+        parser.print_help()
+    else:
+        args.func(args)
+
+
+if __name__ == '__main__':
+    _main()

omdev/wheelfile.py

@@ -0,0 +1,246 @@
+# @omlish-lite
+# ruff: noqa: UP006 UP007
+# https://github.com/pypa/wheel/blob/7bb46d7727e6e89fe56b3c78297b3af2672bbbe2/src/wheel/wheelfile.py
+# MIT License
+#
+# Copyright (c) 2012 Daniel Holth <dholth@fastmail.fm> and contributors
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+# documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+# persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+import base64
+import csv
+import hashlib
+import io
+import os.path
+import re
+import stat
+import time
+import typing as ta
+import zipfile
+
+
+class WheelError(Exception):
+    pass
+
+
+# Non-greedy matching of an optional build number may be too clever (more invalid wheel filenames will match). Separate
+# regex for .dist-info?
+WHEEL_INFO_RE = re.compile(
+    r'^'
+    r'(?P<namever>(?P<name>[^\s-]+?)-(?P<ver>[^\s-]+?))'
+    r'(-(?P<build>\d[^\s-]*))?-'
+    r'(?P<pyver>[^\s-]+?)-'
+    r'(?P<abi>[^\s-]+?)-'
+    r'(?P<plat>\S+)'
+    r'\.whl$',
+    re.VERBOSE,
+)
+
+
+class WheelFile(zipfile.ZipFile):
+    """
+    A ZipFile derivative class that also reads SHA-256 hashes from .dist-info/RECORD and checks any read files against
+    those.
+    """
+
+    _default_algorithm = hashlib.sha256
+
+    def __init__(
+            self,
+            file: str,
+            mode: str = 'r',  # ta.Literal["r", "w", "x", "a"]
+            compression: int = zipfile.ZIP_DEFLATED,
+    ) -> None:
+        basename = os.path.basename(file)
+        self.parsed_filename = WHEEL_INFO_RE.match(basename)
+        if not basename.endswith('.whl') or self.parsed_filename is None:
+            raise WheelError(f'Bad wheel filename {basename!r}')
+
+        super().__init__(  # type: ignore
+            file,
+            mode,
+            compression=compression,
+            allowZip64=True,
+        )
+
+        self.dist_info_path = '{}.dist-info'.format(self.parsed_filename.group('namever'))
+        self.record_path = self.dist_info_path + '/RECORD'
+        self._file_hashes: ta.Dict[str, ta.Union[ta.Tuple[None, None], ta.Tuple[int, bytes]]] = {}
+        self._file_sizes: ta.Dict[str, int] = {}
+
+        if mode == 'r':
+            # Ignore RECORD and any embedded wheel signatures
+            self._file_hashes[self.record_path] = None, None
+            self._file_hashes[self.record_path + '.jws'] = None, None
+            self._file_hashes[self.record_path + '.p7s'] = None, None
+
+            # Fill in the expected hashes by reading them from RECORD
+            try:
+                record = self.open(self.record_path)
+            except KeyError:
+                raise WheelError(f'Missing {self.record_path} file') from None
+
+            with record:
+                for line in csv.reader(io.TextIOWrapper(record, newline='', encoding='utf-8')):
+                    path, hash_sum, size = line
+                    if not hash_sum:
+                        continue
+
+                    algorithm, hash_sum = hash_sum.split('=')
+                    try:
+                        hashlib.new(algorithm)
+                    except ValueError:
+                        raise WheelError(f'Unsupported hash algorithm: {algorithm}') from None
+
+                    if algorithm.lower() in {'md5', 'sha1'}:
+                        raise WheelError(f'Weak hash algorithm ({algorithm}) is not permitted by PEP 427')
+
+                    self._file_hashes[path] = (  # type: ignore
+                        algorithm,
+                        self._urlsafe_b64decode(hash_sum.encode('ascii')),
+                    )
+
+    @staticmethod
+    def _urlsafe_b64encode(data: bytes) -> bytes:
+        """urlsafe_b64encode without padding"""
+        return base64.urlsafe_b64encode(data).rstrip(b'=')
+
+    @staticmethod
+    def _urlsafe_b64decode(data: bytes) -> bytes:
+        """urlsafe_b64decode without padding"""
+        pad = b'=' * (4 - (len(data) & 3))
+        return base64.urlsafe_b64decode(data + pad)
+
+    def open(  # type: ignore  # noqa
+            self,
+            name_or_info: ta.Union[str, zipfile.ZipInfo],
+            mode: str = 'r',  # ta.Literal["r", "w"]
+            pwd: ta.Optional[bytes] = None,
+    ) -> ta.IO[bytes]:
+        def _update_crc(newdata: bytes) -> None:
+            eof = ef._eof  # type: ignore  # noqa
+            update_crc_orig(newdata)
+            running_hash.update(newdata)
+            if eof and running_hash.digest() != expected_hash:
+                raise WheelError(f"Hash mismatch for file '{ef_name}'")
+
+        ef_name = name_or_info.filename if isinstance(name_or_info, zipfile.ZipInfo) else name_or_info
+        if (
+                mode == 'r'
+                and not ef_name.endswith('/')
+                and ef_name not in self._file_hashes
+        ):
+            raise WheelError(f"No hash found for file '{ef_name}'")
+
+        ef = super().open(name_or_info, mode, pwd)  # noqa
+        if mode == 'r' and not ef_name.endswith('/'):
+            algorithm, expected_hash = self._file_hashes[ef_name]
+            if expected_hash is not None:
+                # Monkey patch the _update_crc method to also check for the hash from RECORD
+                running_hash = hashlib.new(algorithm)  # type: ignore
+                update_crc_orig, ef._update_crc = ef._update_crc, _update_crc  # type: ignore  # noqa
+
+        return ef
+
+    def write_files(self, base_dir: str) -> None:
+        deferred: list[tuple[str, str]] = []
+        for root, dirnames, filenames in os.walk(base_dir):
+            # Sort the directory names so that `os.walk` will walk them in a defined order on the next iteration.
+            dirnames.sort()
+            for name in sorted(filenames):
+                path = os.path.normpath(os.path.join(root, name))
+                if os.path.isfile(path):
+                    arcname = os.path.relpath(path, base_dir).replace(os.path.sep, '/')
+                    if arcname == self.record_path:
+                        pass
+                    elif root.endswith('.dist-info'):
+                        deferred.append((path, arcname))
+                    else:
+                        self.write(path, arcname)
+
+        deferred.sort()
+        for path, arcname in deferred:
+            self.write(path, arcname)
+
+    def write(  # type: ignore  # noqa
+            self,
+            filename: str,
+            arcname: ta.Optional[str] = None,
+            compress_type: ta.Optional[int] = None,
+    ) -> None:
+        with open(filename, 'rb') as f:
+            st = os.fstat(f.fileno())
+            data = f.read()
+
+        zinfo = zipfile.ZipInfo(
+            arcname or filename,
+            date_time=self._get_zipinfo_datetime(st.st_mtime),
+        )
+        zinfo.external_attr = (stat.S_IMODE(st.st_mode) | stat.S_IFMT(st.st_mode)) << 16
+        zinfo.compress_type = compress_type or self.compression
+        self.writestr(zinfo, data, compress_type)
+
+    _MINIMUM_TIMESTAMP = 315532800  # 1980-01-01 00:00:00 UTC
+
+    @classmethod
+    def _get_zipinfo_datetime(cls, timestamp: ta.Optional[float] = None) -> ta.Any:
+        # Some applications need reproducible .whl files, but they can't do this without forcing the timestamp of the
+        # individual ZipInfo objects. See issue #143.
+        timestamp = int(os.environ.get('SOURCE_DATE_EPOCH', timestamp or time.time()))
+        timestamp = max(timestamp, cls._MINIMUM_TIMESTAMP)
+        return time.gmtime(timestamp)[0:6]
+
+    def writestr(  # type: ignore  # noqa
+            self,
+            zinfo_or_arcname: ta.Union[str, zipfile.ZipInfo],
+            data: ta.Any,  # SizedBuffer | str,
+            compress_type: ta.Optional[int] = None,
+    ) -> None:
+        if isinstance(zinfo_or_arcname, str):
+            zinfo_or_arcname = zipfile.ZipInfo(
+                zinfo_or_arcname,
+                date_time=self._get_zipinfo_datetime(),
+            )
+            zinfo_or_arcname.compress_type = self.compression
+            zinfo_or_arcname.external_attr = (0o664 | stat.S_IFREG) << 16
+
+        if isinstance(data, str):
+            data = data.encode('utf-8')
+
+        super().writestr(zinfo_or_arcname, data, compress_type)
+        fname = (
+            zinfo_or_arcname.filename
+            if isinstance(zinfo_or_arcname, zipfile.ZipInfo)
+            else zinfo_or_arcname
+        )
+        if fname != self.record_path:
+            hash_ = self._default_algorithm(data)  # type: ignore
+            self._file_hashes[fname] = (  # type: ignore
+                hash_.name,
+                self._urlsafe_b64encode(hash_.digest()).decode('ascii'),
+            )
+            self._file_sizes[fname] = len(data)
+
+    def close(self) -> None:
+        # Write RECORD
+        if self.fp is not None and self.mode == 'w' and self._file_hashes:
+            data = io.StringIO()
+            writer = csv.writer(data, delimiter=',', quotechar='"', lineterminator='\n')
+            writer.writerows((
+                (fname, algorithm + '=' + hash_, self._file_sizes[fname])  # type: ignore
+                for fname, (algorithm, hash_) in self._file_hashes.items()
+            ))
+            writer.writerow((format(self.record_path), '', ''))
+            self.writestr(self.record_path, data.getvalue())
+
+        super().close()

omdev-0.0.0.dev13.dist-info/METADATA

@@ -0,0 +1,33 @@
+Metadata-Version: 2.1
+Name: omdev
+Version: 0.0.0.dev13
+Summary: omdev
+Author: wrmsr
+License: BSD-3-Clause
+Project-URL: source, https://github.com/wrmsr/omlish
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Operating System :: POSIX
+Requires-Python: ~=3.12
+License-File: LICENSE
+Requires-Dist: omlish ==0.0.0.dev13
+Provides-Extra: all
+Requires-Dist: pycparser ~=2.22 ; extra == 'all'
+Requires-Dist: cffi ~=1.17 ; extra == 'all'
+Requires-Dist: pcpp ~=1.30 ; extra == 'all'
+Requires-Dist: mypy ~=1.11 ; extra == 'all'
+Requires-Dist: tokenize-rt ~=6.0 ; extra == 'all'
+Requires-Dist: wheel ~=0.44 ; extra == 'all'
+Provides-Extra: c
+Requires-Dist: pycparser ~=2.22 ; extra == 'c'
+Requires-Dist: cffi ~=1.17 ; extra == 'c'
+Requires-Dist: pcpp ~=1.30 ; extra == 'c'
+Provides-Extra: mypy
+Requires-Dist: mypy ~=1.11 ; extra == 'mypy'
+Provides-Extra: tokens
+Requires-Dist: tokenize-rt ~=6.0 ; extra == 'tokens'
+Provides-Extra: wheel
+Requires-Dist: wheel ~=0.44 ; extra == 'wheel'
+

{omdev-0.0.0.dev11.dist-info → omdev-0.0.0.dev13.dist-info}/RECORD

@@ -1,16 +1,17 @@
-omdev/__about__.py,sha256=RXVZPsAF1ImmY7x_3cw2VrnoxdQ_bCa4unQHrnII14Y,722
+omdev/__about__.py,sha256=VuY8DTDYJifMW_xeF21JIhFM-MwVp1F0vWUhzIqomJA,784
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/classdot.py,sha256=urN5Pzd2ooAwnfkH0z-muQxdO90IMo-sX2WB-A37lVU,1533
-omdev/cmake.py,sha256=Sk9SL_mFCuYG0FYjG_w53wGt6mOmXfen5pZWZsqjSq4,4592
+omdev/cmake.py,sha256=Diy2ry65806dQP125DAstD3w46z_wszMH7PwC2-6iik,4578
 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=OE1udULO1g4McUbeg1CoHbSm4hbQ2kcE3ffEGxlnPh4,69
-omdev/amalg/amalg.py,sha256=2k9oHxP5HDKopfWspABq2ZVjVsZpUZoejUnHeL7cE9M,11477
+omdev/amalg/amalg.py,sha256=q1YysHehhJtHuf9znZ2cpPT5nFz1WQLXWVcIv99BVyI,11867
 omdev/exts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/exts/build.py,sha256=zViF1wYx6z5ACyifgNjlCAVoPAMCKpTr_VoAvwtmvtY,1013
-omdev/exts/cmake.py,sha256=aUMk7irjo6Dr2BjpAyxmFE2V_a7jMCoa89kZmPx_f7w,5745
+omdev/exts/cmake.py,sha256=D1RCmOAowxunEq8HAlIL_8514SBniDPlfynVdAzHS3c,9584
 omdev/exts/importhook.py,sha256=HgEM6UD52BoQi4dhSSk8buoqV6YRUvzQOOWzX6W1aic,2306
-omdev/exts/scan.py,sha256=rUfRFzKn8Tu_2B-en0bdkrjMlqb8qWK7SOCf7AF2-wk,1642
+omdev/exts/scan.py,sha256=ivk_Zh_AnOu8jHeaFZnITwMSwaQqOcHxwOjzsAyL1Gc,1640
 omdev/exts/_distutils/__init__.py,sha256=c1zImtnPh3uY8BUTV4RLKtGKqTPx3c_pBbhA6tPtNsE,297
 omdev/exts/_distutils/build_ext.py,sha256=STHl9Rq2KeWJ3dQ8j8LwIQ-vFc4-3XsYWQ8Qc5_VByU,13833
 omdev/exts/_distutils/dir_util.py,sha256=xxfAIPHbjlh-aW9OX6UGDrXiXfB5biG4xEC5RA6oszM,2882
@@ -48,9 +49,9 @@ omdev/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/scripts/bracepy.py,sha256=CUg3nNKE8n34a5j77SUli8ivsOj5ks6I_5VIF8bl-zY,2562
 omdev/scripts/execrss.py,sha256=wBpdhWuQj_4EnEmvK_aLQHxaE-J52G9F6g0210fTNe8,307
 omdev/scripts/findimports.py,sha256=d8Xf2TcE7hHh_lXUx2V1APF4Jggu2uO2K0ex6bfmqyQ,2030
-omdev/scripts/findmagic.py,sha256=W7W07YR3zsA0hNej6-BPgQj2hWX1UydrbWnNMRdMA88,1893
-omdev/scripts/interp.py,sha256=z66pI9s1yVOD-HMCDdHzq6gRfezoex5MjQ7jnJIAIuU,62939
-omdev/scripts/pyproject.py,sha256=df2a4oKTWMohgSgiEKLshdABhkIapKH3arlbdJ71XeM,119248
+omdev/scripts/findmagic.py,sha256=z_D9zzZJBuWPbR20NEh8i8NJBnCYWlttg2GTJpmDM4s,1994
+omdev/scripts/interp.py,sha256=itY5pq1ahDjw8mYZcHec5qQRbAZezliPUyyZ1VD7zTg,63037
+omdev/scripts/pyproject.py,sha256=NuWW0nu897jaydR-1f-Gz7pxl-zzTOjNwKiCK3uzjDY,119370
 omdev/scripts/traceimport.py,sha256=JmUgLEQLY7r3QNQ14Agarqh5qtMyRNenCb_OF5EIikY,13392
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/toml/parser.py,sha256=84bn09uhYHwQGyfww6Rw6y1RxPAE_HDltODOSakcqDM,29186
@@ -58,12 +59,13 @@ omdev/toml/writer.py,sha256=StGYPvqgN__A2IxTI4rYeHMx8dLAFt8uogHG8dJdShs,2781
 omdev/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/dockertools.py,sha256=3844AhUst6kYo2xKNn-2Npi-f6r4rocxEOx0tHjE0dk,2063
 omdev/tools/gittools.py,sha256=zPy2D5WDs-CbwT86_T_hbaq5yCuss5e-ouUccXC6xlg,578
+omdev/tools/revisions.py,sha256=LSW3IK5P4FFcZyD0f4hcObnf9cWv3_OoTqeP85UiX8E,4842
 omdev/tools/sqlrepl.py,sha256=v9uVQ4nvquSXcQVYIFq34ikumSILvKqzD6lUKLcncCE,5646
 omdev/versioning/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/versioning/specifiers.py,sha256=6Odf9e6farwlPRsD_YqwTfYKG-BXn_dIcKtqfkhfodI,17432
 omdev/versioning/versions.py,sha256=ei2eopEsJq3zSMJmezK1nzZgikgCdxFtnF3f69nCRZQ,12246
-omdev-0.0.0.dev11.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev11.dist-info/METADATA,sha256=LKBayZPwTJ2L-NtTD5tbPJhkobNBYsJ8g2MO_mC0NKE,1008
-omdev-0.0.0.dev11.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-omdev-0.0.0.dev11.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev11.dist-info/RECORD,,
+omdev-0.0.0.dev13.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev13.dist-info/METADATA,sha256=EWbybLAXeBMkrn_XTfZlFQYsGO837utkj7Qgs1rXGXo,1126
+omdev-0.0.0.dev13.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
+omdev-0.0.0.dev13.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev13.dist-info/RECORD,,

{omdev-0.0.0.dev11.dist-info → omdev-0.0.0.dev13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.0.0)
+Generator: setuptools (74.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

omdev-0.0.0.dev11.dist-info/METADATA

@@ -1,30 +0,0 @@
-Metadata-Version: 2.1
-Name: omdev
-Version: 0.0.0.dev11
-Summary: omdev
-Author: wrmsr
-License: BSD-3-Clause
-Project-URL: source, https://github.com/wrmsr/omlish
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Development Status :: 2 - Pre-Alpha
-Classifier: Intended Audience :: Developers
-Classifier: Operating System :: OS Independent
-Classifier: Operating System :: POSIX
-Requires-Python: >=3.12
-License-File: LICENSE
-Requires-Dist: omlish ==0.0.0.dev11
-Provides-Extra: all
-Requires-Dist: pycparser >=2.22 ; extra == 'all'
-Requires-Dist: cffi >=1.17 ; extra == 'all'
-Requires-Dist: pcpp >=1.30 ; extra == 'all'
-Requires-Dist: mypy >=1.11 ; extra == 'all'
-Requires-Dist: tokenize-rt >=6 ; extra == 'all'
-Provides-Extra: c
-Requires-Dist: pycparser >=2.22 ; extra == 'c'
-Requires-Dist: cffi >=1.17 ; extra == 'c'
-Requires-Dist: pcpp >=1.30 ; extra == 'c'
-Provides-Extra: mypy
-Requires-Dist: mypy >=1.11 ; extra == 'mypy'
-Provides-Extra: tokens
-Requires-Dist: tokenize-rt >=6 ; extra == 'tokens'
-