omdev 0.0.0.dev47__py3-none-any.whl → 0.0.0.dev48__py3-none-any.whl

omdev/.manifests.json

@@ -147,7 +147,7 @@
     "module": ".tools.importscan",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/importscan.py",
-    "line": 165,
+    "line": 166,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "importscan",

omdev/cli/managers.py

@@ -45,7 +45,7 @@ def detect_install_manager(cli_pkg: str) -> ManagerType | None:
 
 
 ##
-# Python is insistent in prepending sys.path with an empty string (translating to the current working directory),
+# Python is insistent on prepending sys.path with an empty string (translating to the current working directory),
 # which leads to problems when using the cli in directories containing python packages (such as within this very
 # source tree). This can't be done in cli main as the code frequently spawns other sys.executable processes which
 # wouldn't know to do that, so a .pth file hack is used. Cleaning sys.path solely there is also insufficient as that

omdev/scripts/importtrace.py

@@ -490,12 +490,32 @@ def _main() -> None:
         raise EnvironmentError(f'Requires python {REQUIRED_PYTHON_VERSION}, got {sys.version_info} from {sys.executable}')  # noqa
 
     import argparse
+
     parser = argparse.ArgumentParser()
+    parser.add_argument('--python')
     parser.add_argument('--sqlite')
     parser.add_argument('--pretty', action='store_true')
     parser.add_argument('mod')
     args = parser.parse_args()
 
+    if args.python:
+        import inspect
+        import subprocess
+
+        mod_src = inspect.getsource(sys.modules[__name__])
+        subprocess.run(
+            [
+                args.python,
+                '-',
+                *(['--sqlite', args.sqlite] if args.sqlite else []),
+                *(['--pretty'] if args.pretty else []),
+                args.mod,
+            ],
+            input=mod_src.encode(),
+            check=True,
+        )
+        return
+
     node = ImportTracer(stringify_fields=True).trace(args.mod)
 
     if args.sqlite:

omdev/tools/importscan.py

@@ -75,6 +75,7 @@ def run_one(
         spec: str,
         *,
         shell_wrap: bool = True,
+        python: str | None = None,
 ) -> Item:
     spec_payload_src = '\n\n'.join([
         payload_src(),
@@ -82,7 +83,7 @@ def run_one(
     ])
 
     args = [
-        sys.executable,
+        python or sys.executable,
         '-c',
         spec_payload_src,
     ]
@@ -171,6 +172,7 @@ def _main() -> None:
     parser.add_argument('-j', '--jobs', type=int)
     parser.add_argument('-f', '--filter', action='append')
     parser.add_argument('-t', '--filter-tests', action='store_true')
+    parser.add_argument('--python', default=sys.executable)
     parser.add_argument('root', nargs='+')
     args = parser.parse_args()
 
@@ -185,6 +187,7 @@ def _main() -> None:
             *args.root,
             filters=filters,
             num_threads=args.jobs,
+            python=args.python,
     ).values():
         print(json.dumps(dc.asdict(item)))
 

{omdev-0.0.0.dev47.dist-info → omdev-0.0.0.dev48.dist-info}/METADATA

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

{omdev-0.0.0.dev47.dist-info → omdev-0.0.0.dev48.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=kEgqk5lxYhb_GAnksPc5f0xDcG-5eMUtdcT-v77bCzU,3918
+omdev/.manifests.json,sha256=VjSjb16bBoHODQU_kmP3YULw0wclMsAiHbk4dH-kyLk,3918
 omdev/__about__.py,sha256=LqSNNFFcT84xW3W8fIOJ78kPYJKFLIXZyDX-AJREvN0,1005
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=HwBK5XmlOsF_juTel25fRLJK9vHSJCWXuCc-OZlevRQ,2619
@@ -58,7 +58,7 @@ omdev/cli/__main__.py,sha256=5IeIERm-371fSI5ZvPv8eldAJBwgKwpR0R49pTsILNM,76
 omdev/cli/clicli.py,sha256=NY4MF16007Ri31rUsq868u1V9JYDb_2atBALqjjXJK4,1624
 omdev/cli/install.py,sha256=SNsCGUeX5IRR9qpkBUCeK7l0nJ_21JsmTYw7Fwu_cs8,4547
 omdev/cli/main.py,sha256=yRbomneGgDPc7cjN8nMpjLmwKqOrKM6U36b5ED9q6T8,2058
-omdev/cli/managers.py,sha256=SbI9XVP2BL8HOjOPyB8pkzB3enKfN6kabgpr9Y_VSW8,2592
+omdev/cli/managers.py,sha256=qCxIMWbaLZCEIlpK6fe-A7gFBAeBYpde5icahTg9fP8,2592
 omdev/cli/types.py,sha256=7_Owg0P8C8oOObSuOp6aEYSjkEukVFxTT00SRy1bLHM,250
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
@@ -99,7 +99,7 @@ omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
 omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,1064
 omdev/scripts/execrss.py,sha256=d6purJqU99OkMcNxCS1kG2CMfSsw7wjnvBQW7SjyJ70,448
 omdev/scripts/exectime.py,sha256=LRVIJsnvGYUqH-zfCdFnrQCZv1KLXJPtWBWplXMDwhI,407
-omdev/scripts/importtrace.py,sha256=bp6lnrDdh0zPR0cmI3nvlU5QPWybiImpe9SNoJFOrac,13558
+omdev/scripts/importtrace.py,sha256=4ozdphT4VuP8L0kE0HmGMyWaWHnXg1KEukbET4pFgJU,14064
 omdev/scripts/interp.py,sha256=CB9Eg8qPULFIQmMDsbLTGZ74c3xASWrQJ9KriLSb19A,70949
 omdev/scripts/pyproject.py,sha256=lk0Gk6chRLHYRpES32uXDgxsHti4Ui8oGGyJrJu_dnk,157362
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -108,14 +108,14 @@ omdev/toml/writer.py,sha256=lk3on3YXVbWuLJa-xsOzOhs1bBAT1vXqw4mBbluZl_w,3040
 omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
 omdev/tools/dockertools.py,sha256=x00GV8j1KReMXwxJ641GlcsVwHoWeuzdIKVBp36BqwU,5298
 omdev/tools/gittools.py,sha256=i2WFM2pX5riDJBchFXMmegOCuLSjvTkKC1ltqShSo7E,1773
-omdev/tools/importscan.py,sha256=usF35AjdMZacpe8nfP-wfzxelExT5sEQUORNcBKqr5M,3929
+omdev/tools/importscan.py,sha256=vxOMdAABShqt5-G3n6DGHopCZ5uGgciThY0MCa5W0mA,4066
 omdev/tools/piptools.py,sha256=-jR5q3w4sHqntxCLExFCBNIARB788FUsAbJ62PK2sBU,2774
 omdev/tools/proftools.py,sha256=xKSm_yPoCnfsvS3iT9MblDqFMuZmGfI3_koGj8amMyU,145
 omdev/tools/rst.py,sha256=6dWk8QZHoGiLSuBw3TKsXZjjFK6wWBEtPi9krdCLKKg,977
 omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
-omdev-0.0.0.dev47.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev47.dist-info/METADATA,sha256=kyiSHqz1k_l_OPG8hXGKeN1hXpqURFQbCwUnP4MnsGE,1252
-omdev-0.0.0.dev47.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omdev-0.0.0.dev47.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev47.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev47.dist-info/RECORD,,
+omdev-0.0.0.dev48.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev48.dist-info/METADATA,sha256=TNIwSvCuBBTXCk8_Fg5RWsVhF4RIff5EMNPAoJ9Xh2s,1252
+omdev-0.0.0.dev48.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omdev-0.0.0.dev48.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev48.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev48.dist-info/RECORD,,