omdev 0.0.0.dev202__py3-none-any.whl → 0.0.0.dev204__py3-none-any.whl

omdev/.manifests.json

@@ -27,7 +27,7 @@
     "module": ".cexts.cmake",
     "attr": "_CLI_MODULE",
     "file": "omdev/cexts/cmake.py",
-    "line": 323,
+    "line": 331,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cmake",
@@ -51,7 +51,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 138,
+    "line": 156,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cli",
@@ -231,7 +231,7 @@
     "module": ".tools.cc",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/cc.py",
-    "line": 72,
+    "line": 76,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cc",

omdev/cexts/cmake.py

@@ -7,14 +7,22 @@ TODO:
  - symlink headers, included src files (hamt_impl, ...)
  - point / copy output to dst dirs
  - libs
-  - ..
-   - pybind
-   - catch2?
-   - 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 
 
+Libs:
+ - py
+  - pybind https://github.com/pybind/pybind11
+  - nanobind https://github.com/wjakob/nanobind
+ - test
+  - catch2 https://github.com/catchorg/Catch2
+  - ut https://github.com/boost-ext/ut
+ - json
+  - nlohmann https://github.com/nlohmann/json
+ - log
+  - spdlog https://github.com/gabime/spdlog
+
 ==
 
 Done:

omdev/cli/clicli.py

@@ -1,11 +1,13 @@
 import inspect
 import os
+import subprocess
 import sys
 import typing as ta
 import urllib.parse
 import urllib.request
 
 from omlish import __about__
+from omlish import lang
 from omlish.argparse import all as ap
 
 from ..pip import get_root_dists
@@ -88,6 +90,22 @@ class CliCli(ap.Cli):
 
         #
 
+        if lang.can_import('pip'):
+            print('Checking pip install')
+            subprocess.check_call([
+                sys.executable,
+                '-m',
+                'pip',
+                'install',
+                '--dry-run',
+                *deps,
+            ])
+            print('Pip install check successful')
+        else:
+            print('Pip not present, cannot check install')
+
+        #
+
         if deps:
             print('Reinstalling with following additional dependencies:')
             print('\n'.join('  ' + d for d in deps))

omdev/tools/cc.py

@@ -37,7 +37,7 @@ class Cli(ap.Cli):
 
         tmp_dir = tempfile.mkdtemp()
         try:
-            subprocess.check_call(
+            proc = subprocess.run(
                 [
                     check.non_empty_str(shutil.which('clang++')),
                     '-std=c++20',
@@ -46,8 +46,12 @@ class Cli(ap.Cli):
                     src_file_name,
                 ],
                 cwd=tmp_dir,
+                check=False,
             )
 
+            if rc := proc.returncode:
+                return rc
+
             exe_file = os.path.join(tmp_dir, src_file_name)
             check.state(os.path.isfile(exe_file))
 

{omdev-0.0.0.dev202.dist-info → omdev-0.0.0.dev204.dist-info}/METADATA

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

{omdev-0.0.0.dev202.dist-info → omdev-0.0.0.dev204.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=E8zVGP3gKWJuU6J7H1koTq7CmRe-3C__JsoEjOVi6Qo,8812
+omdev/.manifests.json,sha256=TJ4UHHkpFJ99ixc049nQc4Bru6a-WP1iVL0h5xhEQsA,8812
 omdev/__about__.py,sha256=n5x-SO70OgbDQFzQ1d7sZDVMsnkQc4PxQZPFaIQFa0E,1281
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
@@ -45,7 +45,7 @@ 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=JRr2F2u3Y4N2_YyPdscNyO0wnR_hoYqJrKmP5Q7HVwc,9828
+omdev/cexts/cmake.py,sha256=x4WtT2OMQqrfdW-ZvE6JnbFDLpvVl6v_4qwqkb0Ks3E,10057
 omdev/cexts/importhook.py,sha256=4f2nD531oSFQRcSzyOI_yz9ockQQgnEDhha2SQ-yMhk,3562
 omdev/cexts/magic.py,sha256=MPmdhGANFVRaA3351BSTBrXm214dWXro1RMRHaJ2_O0,126
 omdev/cexts/scan.py,sha256=KnwWtFgJ-vvsz6GyHVXI-ufPh8UsOCuNYPbwGm5_du4,1677
@@ -68,7 +68,7 @@ omdev/cexts/_distutils/compilers/unixccompiler.py,sha256=o1h8QuyupLntv4F21_XjzAZ
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=kxqb2kHap68Lkh8b211rDbcgj06hidBiAKA3f9posyc,2119
-omdev/cli/clicli.py,sha256=RiB-0Wis3L3Y0xet9Imm6V1tN87d9FN2rQhcdeXA9bg,3484
+omdev/cli/clicli.py,sha256=UB6K-Hdgi8Y8DP3aXr4wKQfrU-C5iZHScHBC4pZYhmU,3945
 omdev/cli/install.py,sha256=C-W171YlIHt4Cfok-nWSMbHwWhqF_PFqq2HixFttYx8,4460
 omdev/cli/main.py,sha256=OY7ir2WWuDUM1Urmh-WdEv7uEhidRRGnE4FNYHaEN3s,7033
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
@@ -160,7 +160,7 @@ omdev/scripts/pyproject.py,sha256=EEwu-5Fl0cCe0X6CaHOmjSt1vANXRFgsbvn487uKJnI,24
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
-omdev/tools/cc.py,sha256=yglY_zOvEkBZwuxpX_MHGprVU4K0UgaCduVqXPP76w8,1826
+omdev/tools/cc.py,sha256=ERi5pqcvqnGADS4wqbFIktJeUzSxKoAea4cGcCC6sSM,1920
 omdev/tools/cloc.py,sha256=jYlMHBae9oGKN4VKeBGuqjiQNcM2be7KIoTF0oNwx_I,5205
 omdev/tools/doc.py,sha256=wvgGhv6aFaV-Zl-Qivejx37i-lKQ207rZ-4K2fPf-Ss,2547
 omdev/tools/docker.py,sha256=KVFckA8eAdiapFUr8xkfMw9Uv3Qy4oNq0e70Lqt1F7I,7352
@@ -184,9 +184,9 @@ omdev/tools/json/rendering.py,sha256=tMcjOW5edfozcMSTxxvF7WVTsbYLoe9bCKFh50qyaGw
 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.dev202.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev202.dist-info/METADATA,sha256=mkrg8ZLzgCtoz5MSCkkIl7vymRickCN5T8w8CiWlN28,1760
-omdev-0.0.0.dev202.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-omdev-0.0.0.dev202.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev202.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev202.dist-info/RECORD,,
+omdev-0.0.0.dev204.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev204.dist-info/METADATA,sha256=xonF_YAYt18uF6ncqqHydhdDxWsTekhhtOstaY8lbzo,1760
+omdev-0.0.0.dev204.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+omdev-0.0.0.dev204.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev204.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev204.dist-info/RECORD,,