PyPI - omdev - Versions diffs - 0.0.0.dev46__tar.gz → 0.0.0.dev48__tar.gz - Mend

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

@@ -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",

@@ -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

@@ -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:

@@ -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.dev46tar.gz → 0.0.0.dev48tar.gz

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '~=3.12'
-version = '0.0.0.dev46'
+version = '0.0.0.dev48'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev46',
+    'omlish == 0.0.0.dev48',
 ]
 [project.optional-dependencies]