omdev 0.0.0.dev506__py3-none-any.whl → 0.0.0.dev509__py3-none-any.whl

omdev/.omlish-manifests.json

@@ -27,7 +27,7 @@
     "module": ".cexts.cmake",
     "attr": "_CLI_MODULE",
     "file": "omdev/cexts/cmake.py",
-    "line": 335,
+    "line": 375,
     "value": {
       "!.cli.types.CliModule": {
         "name": "cmake",

omdev/cache/data/specs.py

@@ -63,7 +63,7 @@ class UrlSpec(Spec):
 
     _: dc.KW_ONLY
 
-    headers: ta.Mapping[str, str] | None = dc.field(default=None) | msh.with_field_metadata(omit_if=operator.not_)
+    headers: ta.Mapping[str, str] | None = dc.field(default=None) | msh.with_field_options(omit_if=operator.not_)
 
     @cached.property
     def file_name_or_default(self) -> str:

omdev/cexts/cmake.py

@@ -55,6 +55,33 @@ log = logs.get_module_logger(globals())
 ##
 
 
+CLANG_TIDY_COMMAND_TEMPLATE = """
+find_program(CLANG_TIDY_EXE NAMES clang-tidy)
+
+if(CLANG_TIDY_EXE)
+    add_custom_target(tidy
+        COMMAND ${CLANG_TIDY_EXE}
+            -p ${CMAKE_BINARY_DIR}
+            ${ALL_SOURCE_FILES}
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        COMMENT "Running clang-tidy on all source files"
+    )
+
+    add_custom_target(tidy-fix
+        COMMAND ${CLANG_TIDY_EXE}
+            -p ${CMAKE_BINARY_DIR}
+            -fix
+            ${ALL_SOURCE_FILES}
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        COMMENT "Running clang-tidy with automatic fixes"
+    )
+endif()
+"""
+
+
+##
+
+
 def _sep_str_grps(*ls: ta.Sequence[str]) -> list[str]:
     o = []
     for i, l in enumerate(ls):
@@ -112,6 +139,15 @@ class CmakeProjectGen:
         with open(os.path.join(self.cmake_dir(), '.gitignore'), 'w') as f:
             f.write('\n'.join(sorted(['/cmake-*', '/build'])))
 
+    def add_root_symlinks(self) -> None:
+        for fn in [
+            '.clang-tidy',
+        ]:
+            check.state(os.path.isfile(sfp := os.path.abspath(os.path.join(self._prj_root, fn))))
+            dfp = os.path.join(self.cmake_dir(), fn)
+            rp = os.path.relpath(os.path.abspath(sfp), self.cmake_dir())
+            os.symlink(rp, dfp)
+
     #
 
     @dc.dataclass(frozen=True, kw_only=True)
@@ -218,7 +254,7 @@ class CmakeProjectGen:
                         ['TARGET', ext_name, 'POST_BUILD'],
                         [
                             ' '.join([
-                                'COMMAND ${CMAKE_COMMAND} -E ',
+                                'COMMAND ${CMAKE_COMMAND} -E',
                                 f'copy $<TARGET_FILE_NAME:{ext_name}> ../../../{os.path.dirname(ext_src)}/{so_name}',
                             ]),
                             'COMMAND_EXPAND_LISTS',
@@ -235,6 +271,9 @@ class CmakeProjectGen:
             self.g.write(f'project({self.p.prj_name()})')
             self.g.write('')
 
+            self.g.write('set(CMAKE_EXPORT_COMPILE_COMMANDS ON)')
+            self.g.write('')
+
             self.g.write_var(cmake.Var(
                 f'{self.var_prefix}_INCLUDE_DIRECTORIES',
                 _sep_str_grps(
@@ -309,6 +348,7 @@ class CmakeProjectGen:
 
         self.cmake_dir()
         self.write_git_ignore()
+        self.add_root_symlinks()
 
         out = io.StringIO()
         clg = self._CmakeListsGen(self, out)

omdev/imgur.py

@@ -40,7 +40,7 @@ from .home.secrets import load_secrets
 
 
 @dc.dataclass(frozen=True)
-@msh.update_object_metadata(unknown_field='x')
+@msh.update_object_options(unknown_field='x')
 class ImageUploadData:
     id: str
     deletehash: str  # noqa
@@ -66,7 +66,7 @@ class ImageUploadData:
 
 
 @dc.dataclass(frozen=True)
-@msh.update_object_metadata(unknown_field='x')
+@msh.update_object_options(unknown_field='x')
 class ImageUploadResponse:
     status: int
     success: bool

omdev/py/tools/pipdepup.py

@@ -327,6 +327,10 @@ class Package:
     unfiltered_candidates: ta.Sequence[Candidate] | None = None
     candidates: ta.Sequence[Candidate] | None = None
 
+    @cached.function
+    def candidates_by_version(self) -> ta.Mapping[Version, ta.Sequence[Candidate]]:
+        return col.multi_map_by(lambda c: c.version, check.not_none(self.candidates))
+
     latest_candidate: Candidate | None = None
     suggested_candidate: Candidate | None = None
 
@@ -511,7 +515,9 @@ def format_for_columns(pkgs: ta.Sequence[Package]) -> tuple[list[list[str]], lis
 
     header = [
         'Package',
+
         'Current',
+        'Age',
 
         'Suggested',
         'Age',
@@ -543,9 +549,19 @@ def format_for_columns(pkgs: ta.Sequence[Package]) -> tuple[list[list[str]], lis
 
         row = [
             pkg.dist.raw_name,
+
             pkg.dist.raw_version,
         ]
 
+        if (
+                (cs := pkg.candidates_by_version().get(pkg.dist.version)) and
+                # FIXME: lame and wrong lol
+                (c_ut := cs[0].upload_time()) is not None
+        ):
+            row.append(human_round_td(now_utc() - c_ut))
+        else:
+            row.append('')
+
         def add_c(c):
             if c is None:
                 row.extend(['', ''])

omdev/pyproject/tools/buildrs.py

@@ -0,0 +1,85 @@
+import argparse
+import os.path
+import shlex
+import shutil
+import subprocess
+import sys
+import zipfile
+
+from omlish.lite.check import check
+
+
+##
+
+
+def _main() -> None:
+    parser = argparse.ArgumentParser()
+    parser.add_argument('rs_pkg', nargs='*')
+    args = parser.parse_args()
+
+    pkgs_dir = '.pkg'
+    if not os.path.isdir(pkgs_dir):
+        raise RuntimeError(f'{pkgs_dir=} does not exist')
+
+    if not (rs_pkgs := args.rs_pkg):
+        rs_pkgs = sorted(
+            n
+            for n in os.listdir(pkgs_dir)
+            if os.path.isdir(p := os.path.join(pkgs_dir, n))
+            and n.endswith('-rs')
+        )
+
+    for rs_pkg in rs_pkgs:
+        print(rs_pkg)
+
+        rs_pkg_dir = os.path.join(pkgs_dir, rs_pkg)
+
+        for n in os.listdir(rs_pkg_dir):
+            p = os.path.join(rs_pkg_dir, n)
+            if not os.path.isdir(p):
+                continue
+            if n == 'dist' or n.endswith('.egg-info'):
+                shutil.rmtree(p)
+
+        subprocess.run(
+            [
+                'sh', '-c', f'{shlex.quote(sys.executable)} "$@"', '--',  # sys.executable,
+                '-m',
+                'build',
+            ],
+            cwd=rs_pkg_dir,
+            env={
+                **os.environ,
+                'OMLISH_PYCHARM_RUNHACK_ENABLED': '0',
+            },
+            check=True,
+        )
+
+        dist_dir = os.path.join(rs_pkg_dir, 'dist')
+        whl_ns = [
+            n
+            for n in os.listdir(dist_dir)
+            if os.path.isfile(os.path.join(dist_dir, n))
+            and n.endswith('.whl')
+        ]
+        whl_n = check.single(whl_ns)
+        whl_path = os.path.join(dist_dir, whl_n)
+
+        with zipfile.ZipFile(whl_path) as zf:
+            for zn in zf.namelist():
+                if not zn.endswith('.so'):
+                    continue
+
+                zi = zf.getinfo(zn)
+                if zi.is_dir():
+                    continue
+
+                print(zn)
+
+                zf.extract(zi)
+
+        print()
+
+
+if __name__ == '__main__':
+    _main()

{omdev-0.0.0.dev506.dist-info → omdev-0.0.0.dev509.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev506
+Version: 0.0.0.dev509
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev506
+Requires-Dist: omlish==0.0.0.dev509
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"

{omdev-0.0.0.dev506.dist-info → omdev-0.0.0.dev509.dist-info}/RECORD

@@ -1,9 +1,9 @@
-omdev/.omlish-manifests.json,sha256=5Iang5DNd0hsSQQnKms9H4OA_xphlpE1SOWk6NNePOE,11671
+omdev/.omlish-manifests.json,sha256=RoDWqg2je7u5jnJo8Gb7QuVMKsrAGNmxvFGXiLaBoUk,11671
 omdev/README.md,sha256=IxhRiW6wAsK4XKR9lmOlpkTbX8vcNcQwqal8HelK0yU,3326
 omdev/__about__.py,sha256=VvUiwWTVeZ3cQDNaFD-3L3juUvkoLH-o7WR4DfXGexE,1321
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=gu49t10_syXh_TUJs4POsxeFs8we8Y3XTOOPgIXmGvg,4608
-omdev/imgur.py,sha256=oqei705LhSnLWQTOMHMHwRecRXcpSEP90Sg4SVINPQ0,3133
+omdev/imgur.py,sha256=gzYCBH-ehX-gbL4dV7RoxPOjKcQzSfsBxsg2PMeeD6I,3131
 omdev/pip.py,sha256=PqzAWDO_CbiZvXzJAZcCkFqWynUDls1jIgBWlrswQyA,2012
 omdev/tagstrings.py,sha256=cBmAc9-TtOBupvGQ9G4T1jjjtzijx4ihQCBu6FezzV0,5490
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -36,7 +36,7 @@ omdev/cache/data/cache.py,sha256=h5xQUxiye2exsMUWh1pDeMz_t3LEC75kvloIDg57xMI,766
 omdev/cache/data/consts.py,sha256=d6W_aeMqgah6PmPYi9RA8Be54oQ4BcNCy8kDQ7FlB_Q,26
 omdev/cache/data/defaults.py,sha256=NL_mT7kaSLm2Mk9VO5wdSu-DIcHTR1KgcihJqdSd4TY,312
 omdev/cache/data/manifests.py,sha256=NweXxbkuLMBG1DiUFliOSYeXBrLPMIY4GA_gOZzHwho,949
-omdev/cache/data/specs.py,sha256=HdOkg-WCtanJMX-uysLuKfHACX_MW7hrCV5sReXgRJM,2467
+omdev/cache/data/specs.py,sha256=2QWn-WUCbUF6zDQXjJWtagtx2f_Zqp6Q6IVhNExKam4,2466
 omdev/capi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/capi/darwin/__init__.py,sha256=iAlc3ReV3LJOv5X9zGME1FKeZ2yf0auUuj1I3sGSo4E,86
 omdev/capi/darwin/aps.py,sha256=_DAGaOZYk9T1VoO22H5ZiV8F1qeTIQDO7UkYSj5UisE,1278
@@ -54,7 +54,7 @@ omdev/cc/srclangs.py,sha256=3u_APHgknuc-BPRQSDISwSzouluKsnLlBxodp-XCl_E,728
 omdev/cexts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cexts/_boilerplate.cc,sha256=tUTFKyMpammFj-7bF8DbN6jv67Vn7qrwCFDoAgarof8,1753
 omdev/cexts/build.py,sha256=JxEuqSpspnY6kWn8eB89FjcSjF4bpNgVYNeIvwmWehY,2659
-omdev/cexts/cmake.py,sha256=rwsUVjOMjNR9nBCMgK-oWLl0aD5WWUYzVQEYcZ5BZGs,10185
+omdev/cexts/cmake.py,sha256=ySsPuy4va3TlKygvt2_QxKvA29nikdkETaq_Y1tAgok,11285
 omdev/cexts/importhook.py,sha256=GZ04bE6tMQ8uQUUzGr22Rt9cwyI6kkoK4t7xpLP2Lrs,3562
 omdev/cexts/magic.py,sha256=DglhjCXEiL28pFTN4lrmUW6ZLn6HaumR13ptyaFOez4,131
 omdev/cexts/scan.py,sha256=94UqVgxBrAHn_VyW_ZA3-hB_R6pWIJRWqvtSBEg_O4U,1673
@@ -284,7 +284,7 @@ omdev/py/tokens/utils.py,sha256=_dlXx-_npiGeZkMZVbXaXQDGts9yY8UnEJcT_bwPj0A,2084
 omdev/py/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/py/tools/importscan.py,sha256=OYPZBg__u6On416tcmYfRTMkjr1ZlFcOAy9AafJ8iuo,4648
 omdev/py/tools/mkrelimp.py,sha256=kQAADYW1f1Y2WbIuqWOFNWJl96oT7nqW38XPCkLIyjQ,4039
-omdev/py/tools/pipdepup.py,sha256=3s3rTlj0KcVriEw_x3wLuoqQnRjdPCydDWW7fhliUl4,20082
+omdev/py/tools/pipdepup.py,sha256=mSso04OyE3rSU3l9VBQ1CpsvIRB2SM4o1AbqyUsVi2c,20594
 omdev/pyproject/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/pyproject/__main__.py,sha256=gn3Rl1aYPYdiTtEqa9ifi0t-e4ZwPY0vhJ4UXvYdJDY,165
 omdev/pyproject/cli.py,sha256=erEo9VT7c-Fwtq0lJbb_IkWBPqBAAtiui8Xna93yk3Y,7874
@@ -299,6 +299,7 @@ omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQ
 omdev/pyproject/resources/python.sh,sha256=rFaN4SiJ9hdLDXXsDTwugI6zsw6EPkgYMmtacZeTbvw,749
 omdev/pyproject/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/pyproject/tools/aboutdeps.py,sha256=XmvSKsn3kdY0K2Llh-jhNskm4sK46Y8fWnUlPXBrI34,1592
+omdev/pyproject/tools/buildrs.py,sha256=tL7HnkXvjF19W3C0tlxq7yJ08lceUyUH1q84Kn7-fNo,2023
 omdev/pyproject/tools/pyversions.py,sha256=CV6qV5nlrt1or7OQVf3bYIKLfyEdjmgedQVVlr-DroM,1047
 omdev/rs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
@@ -380,9 +381,9 @@ omdev/tui/textual/autocomplete/widget.py,sha256=1UgWqDT0d9wD6w7MNaZBjgj0o9FohYXy
 omdev/tui/textual/debug/__init__.py,sha256=RW9-Toj5_JnXBJCnRiXpXLpRA__MxG01xW1h_iNuUTY,189
 omdev/tui/textual/debug/dominfo.py,sha256=1iH1xbZY-zUoIyfmdvSzVNjGqeeOnBcjeDI2V1Xn3rg,4401
 omdev/tui/textual/debug/screen.py,sha256=w4cbRJWemcu5jBomGDmVtgtjiaWOS1Wkw1Mc6mu-5Zc,594
-omdev-0.0.0.dev506.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev506.dist-info/METADATA,sha256=-JBWJ65uIhhMinlsBPjrg_JJrobPzIkX4v5epiaEjig,5372
-omdev-0.0.0.dev506.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev506.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev506.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev506.dist-info/RECORD,,
+omdev-0.0.0.dev509.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev509.dist-info/METADATA,sha256=5N5gJW5cV8ft6Fd6_YAHcMDYE9poLnAyvhs63U7jmZo,5372
+omdev-0.0.0.dev509.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev509.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev509.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev509.dist-info/RECORD,,