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

omdev/tools/revisions.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 """
 TODO:
  - omlish-lite, move to pyproject/
@@ -13,22 +14,56 @@ import tarfile
 import typing as ta
 import zipfile
 
+from omlish.lite.cached import cached_nullary
 from omlish.lite.logs import configure_standard_logging
 from omlish.lite.logs import log
 
 from ..wheelfile import WheelFile
 
 
-class RevisionAdder:
+##
+
+
+def get_git_revision() -> str:
+    has_untracked = bool(subprocess.check_output([
+        'git',
+        'ls-files',
+        '.',
+        '--exclude-standard',
+        '--others',
+    ]).decode().strip())
+
+    dirty_rev = subprocess.check_output([
+        'git',
+        'describe',
+        '--match=NeVeRmAtCh',
+        '--always',
+        '--abbrev=40',
+        '--dirty',
+    ]).decode().strip()
+
+    return dirty_rev + ('-untracked' if has_untracked else '')
+
+
+##
+
+
+class GitRevisionAdder:
     def __init__(
             self,
-            revision: str,
+            revision: ta.Optional[str] = None,
             output_suffix: ta.Optional[str] = None,
     ) -> None:
         super().__init__()
-        self._revision = revision
+        self._given_revision = revision
         self._output_suffix = output_suffix
 
+    @cached_nullary
+    def revision(self) -> str:
+        if self._given_revision is not None:
+            return self._given_revision
+        return get_git_revision()
+
     REVISION_ATTR = '__revision__'
 
     def add_to_contents(self, dct: ta.Dict[str, bytes]) -> bool:
@@ -41,7 +76,7 @@ class RevisionAdder:
             for i, l in enumerate(lines):
                 if l != f'{self.REVISION_ATTR} = None\n':
                     continue
-                lines[i] = f"{self.REVISION_ATTR} = '{self._revision}'\n"
+                lines[i] = f"{self.REVISION_ATTR} = '{self.revision()}'\n"
                 changed = True
             dct[n] = ''.join(lines).encode('utf-8')
         return changed
@@ -106,6 +141,8 @@ class RevisionAdder:
             self.add_to_tgz(f)
 
     def add_to(self, tgt: str) -> None:
+        log.info('Using revision %s', self.revision())
+
         if os.path.isfile(tgt):
             self.add_to_file(tgt)
 
@@ -119,55 +156,35 @@ class RevisionAdder:
 #
 
 
-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)
-
+if __name__ == '__main__':
+    def _add_cmd(args) -> None:
+        if not args.targets:
+            raise Exception('must specify targets')
 
-def _main(argv=None) -> None:
-    configure_standard_logging('INFO')
+        ra = GitRevisionAdder(
+            args.revision,
+            output_suffix=args.suffix,
+        )
+        for tgt in args.targets:
+            ra.add_to(tgt)
 
-    parser = argparse.ArgumentParser()
+    def _main(argv=None) -> None:
+        configure_standard_logging('INFO')
 
-    subparsers = parser.add_subparsers()
+        parser = argparse.ArgumentParser()
 
-    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)
+        subparsers = parser.add_subparsers()
 
-    args = parser.parse_args(argv)
-    if not getattr(args, 'func', None):
-        parser.print_help()
-    else:
-        args.func(args)
+        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/{scripts → tools}/traceimport.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# @omlish-script
+# ruff: noqa: UP006 UP007
 """
 TODO:
  - hoist first stacktrace file to a full field
@@ -123,7 +125,7 @@ class StatsFactory:
 
     @classmethod
     def get_proc_status(cls) -> ta.Mapping[str, ta.Any]:
-        with open('/proc/self/status', 'r') as status_file:
+        with open('/proc/self/status') as status_file:
             status_block = status_file.read()
 
         status_fields = {

{omdev-0.0.0.dev13.dist-info → omdev-0.0.0.dev15.dist-info}/METADATA

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

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

@@ -1,16 +1,19 @@
 omdev/__about__.py,sha256=VuY8DTDYJifMW_xeF21JIhFM-MwVp1F0vWUhzIqomJA,784
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omdev/bracepy.py,sha256=HwBK5XmlOsF_juTel25fRLJK9vHSJCWXuCc-OZlevRQ,2619
 omdev/classdot.py,sha256=urN5Pzd2ooAwnfkH0z-muQxdO90IMo-sX2WB-A37lVU,1533
 omdev/cmake.py,sha256=Diy2ry65806dQP125DAstD3w46z_wszMH7PwC2-6iik,4578
+omdev/findimports.py,sha256=P8v4I1tm6g-PEWJiNwAKxErvWwL-Nop83vAuwq1kR5A,2246
+omdev/findmagic.py,sha256=t8q1OoWVTFXTSDS36dr79ScTYLYk786Z9wFj8UObneQ,2170
 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=q1YysHehhJtHuf9znZ2cpPT5nFz1WQLXWVcIv99BVyI,11867
+omdev/amalg/amalg.py,sha256=YEyH097MZop-f1qobZJW__srtyLFS3rI7M2MaRtshKg,13057
 omdev/exts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/exts/build.py,sha256=zViF1wYx6z5ACyifgNjlCAVoPAMCKpTr_VoAvwtmvtY,1013
-omdev/exts/cmake.py,sha256=D1RCmOAowxunEq8HAlIL_8514SBniDPlfynVdAzHS3c,9584
-omdev/exts/importhook.py,sha256=HgEM6UD52BoQi4dhSSk8buoqV6YRUvzQOOWzX6W1aic,2306
+omdev/exts/cmake.py,sha256=xv3VfDFXcHr6c5qS7buvV3zSvlpyRgr04YD12hZ0P3s,10120
+omdev/exts/importhook.py,sha256=nljqEuPopuh10DPeSrIYKmkV4z-Wk5Q7WpUid1JEmkg,3530
 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
@@ -39,33 +42,33 @@ omdev/interp/system.py,sha256=UFHfMR0CHCEnNx5fhrze8esAwigpRrJUA33ftq6nA0I,3514
 omdev/interp/types.py,sha256=lY0pDECxy4qtx2KI7Ve8r2quriiBi9px0Bull2zsYPw,2351
 omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/mypy/debug.py,sha256=WcZw-3Z1njg_KFGqi3DB6RuqbBa3dLArJnjVCuY1Mn0,3003
+omdev/precheck/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omdev/precheck/__main__.py,sha256=wKF_2KP2Yn1hKDEOCGR_fm5zu9UHMWCZtuEmWjpprrU,72
+omdev/precheck/precheck.py,sha256=2yTjNGvjPYf3QxUBbCbehBYYuB8gDR_dYSTrlNCs9qU,8322
 omdev/pyproject/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/pyproject/__main__.py,sha256=gFhR9DikwDZk0LqgdR3qq_aXQHThUOPllDmHDOfnFAU,67
-omdev/pyproject/cli.py,sha256=GdySmyf9sdphiFLuOqknStTrdX9A2vf1IxZ9eImRE7k,9755
+omdev/pyproject/cli.py,sha256=ywK2RyovwgwameZfXrvZylzZ87KQ0RDhzEAljKi7qv8,9918
 omdev/pyproject/configs.py,sha256=MFHnmpMjlwxw74-SyX1Q1qNQ4ptwTXEzDGkeUcGY0mA,2822
 omdev/pyproject/ext.py,sha256=x13piOOnNrYbA17qZLDVuR0p1sqhgEwpk4FtImX-klM,4281
-omdev/pyproject/pkg.py,sha256=HgRFK9euQ8gmWHpnPgZkGHjOrIus_NSjAznn8yEQvBA,5690
+omdev/pyproject/pkg.py,sha256=YrnqZK-b2qJh6kSkvYjZ19F39NU0kpbth1FYItpFZ80,5977
 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=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/scripts/execrss.py,sha256=HzDNmwXOO8fMwIRXw9q8CUnVfLFCQASyU2tfY_y2Vf8,324
+omdev/scripts/interp.py,sha256=Xuj509nGwClnR4MvnB8CJJQ7KhfjdGmzN9ul17-SXjI,63069
+omdev/scripts/pyproject.py,sha256=JwEjizuEdKH0TOzfqlfQ0NYkQ3KqzUg-8FtS6lR_-F8,134057
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/toml/parser.py,sha256=84bn09uhYHwQGyfww6Rw6y1RxPAE_HDltODOSakcqDM,29186
 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/revisions.py,sha256=pJBHRdgImLnFSo9h6pPsdX-Xbam3UnFOapWrY4U49-A,5393
 omdev/tools/sqlrepl.py,sha256=v9uVQ4nvquSXcQVYIFq34ikumSILvKqzD6lUKLcncCE,5646
+omdev/tools/traceimport.py,sha256=oDry9CwIv5h96wSaTVKJ0qQ5vMGxYE5oBtfF-GYNLJs,13430
 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.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.dev15.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev15.dist-info/METADATA,sha256=IJ5mjDBhE_U1FPb334y41pHjcahk8npX1rbf9Zc1cMg,1126
+omdev-0.0.0.dev15.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
+omdev-0.0.0.dev15.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev15.dist-info/RECORD,,

omdev/scripts/findimports.py

@@ -1,62 +0,0 @@
-#!/usr/bin/env python3
-"""
-TODO:
- - multiple commands:
-  - dumb cmp (a = set(sys.modules); import ...; print(set(sys.modules) - a)
-"""
-import ast
-import importlib.machinery
-import importlib.util
-import os.path
-import sys
-
-
-_BUILTIN_MODULE_NAMES = frozenset([*sys.builtin_module_names, *sys.stdlib_module_names])
-
-
-def _main() -> None:
-    def handle(fp: str) -> None:
-        def rec(n):
-            nodes.append(n)
-            for c in ast.iter_child_nodes(n):
-                rec(c)
-        # if not os.path.isfile(os.path.join(os.path.dirname(fp), '__init__.py')):
-        #     return
-        with open(fp, 'r') as f:
-            buf = f.read()
-        nodes: list[ast.AST] = []
-        rec(ast.parse(buf))
-        imps.update(na.name for i in nodes if isinstance(i, ast.Import) for na in i.names)
-        imps.update(i.module for i in nodes if isinstance(i, ast.ImportFrom) if i.module and not i.level)
-
-    imps: set[str] = set()
-    for rootp in sys.argv[1:]:
-        if os.path.isfile(rootp):
-            if rootp.endswith('.py'):
-                handle(os.path.join(os.path.dirname(rootp), os.path.basename(rootp)))
-        else:
-            for dp, dns, fns in os.walk(os.path.expanduser(rootp)):  # noqa
-                for fn in fns:
-                    if fn.endswith('.py'):
-                        handle(os.path.join(dp, fn))
-
-    def whichmod(i: str) -> str:
-        try:
-            l = importlib.util.find_spec(i)
-        except (ImportError, ValueError):
-            return 'bad'
-        if not isinstance(l, importlib.machinery.ModuleSpec) or not l.origin:
-            return 'bad'
-        # if l.origin.startswith(sys.base_prefix) or l.origin == 'frozen':
-        #     return 'builtin'
-        if i in _BUILTIN_MODULE_NAMES:
-            return 'builtin'
-        return 'dep'
-
-    eimps = {n for n in imps for n in [n.split('.')[0]] if n not in sys.builtin_module_names}
-    deps = {i for i in eimps if whichmod(i) != 'builtin'}
-    print(chr(10).join(sorted(deps)))
-
-
-if __name__ == '__main__':
-    _main()