omdev 0.0.0.dev357__tar.gz → 0.0.0.dev359__tar.gz

{omdev-0.0.0.dev357/omdev.egg-info → omdev-0.0.0.dev359}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev357
+Version: 0.0.0.dev359
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev357
+Requires-Dist: omlish==0.0.0.dev359
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev357 → omdev-0.0.0.dev359}/omdev/.manifests.json

@@ -39,7 +39,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 193,
+    "line": 229,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cli",

{omdev-0.0.0.dev357 → omdev-0.0.0.dev359}/omdev/cli/clicli.py

@@ -11,6 +11,7 @@ import urllib.request
 from omlish import __about__
 from omlish import lang
 from omlish.argparse import all as ap
+from omlish.os.temp import temp_dir_context
 
 from ..pip import get_root_dists
 from ..pip import lookup_latest_package_version
@@ -90,6 +91,7 @@ class CliCli(ap.Cli):
         ap.arg('--url', default=DEFAULT_REINSTALL_URL),
         ap.arg('--local', action='store_true'),
         ap.arg('--no-deps', action='store_true'),
+        ap.arg('--no-uv', action='store_true'),
         ap.arg('--dry-run', action='store_true'),
         ap.arg('--version'),
         ap.arg('extra_deps', nargs='*'),
@@ -112,20 +114,54 @@ class CliCli(ap.Cli):
 
         #
 
-        if lang.can_import('pip'):
-            print('Checking pip install')
-            subprocess.check_call([
-                sys.executable,
-                '-m',
-                'pip',
-                'install',
-                '--dry-run',
-                install.DEFAULT_CLI_PKG,
-                *deps,
-            ])
-            print('Pip install check successful')
+        if lang.can_import('venv'):
+            print('Checking venv install')
+
+            with temp_dir_context() as tmp_dir:
+                venv_dir = os.path.join(tmp_dir, 'venv')
+                subprocess.check_call([
+                    sys.executable,
+                    '-m', 'venv',
+                    venv_dir,
+                ])
+                venv_exe = os.path.join(venv_dir, 'bin', 'python')
+
+                subprocess.check_call([
+                    venv_exe,
+                    '-m', 'ensurepip',
+                    '--upgrade',
+                ])
+
+                if self.args.no_uv:
+                    pip_cmd = [
+                        venv_exe,
+                        '-m', 'pip',
+                    ]
+                else:
+                    subprocess.check_call([
+                        venv_exe,
+                        '-m', 'pip',
+                        'install',
+                        'uv',
+                    ])
+                    pip_cmd = [
+                        venv_exe,
+                        '-m', 'uv',
+                        'pip',
+                    ]
+
+                subprocess.check_call([
+                    *pip_cmd,
+                    'install',
+                    '--dry-run',
+                    f'{install.DEFAULT_CLI_PKG}=={target_version}',
+                    *deps,
+                ])
+
+                print('Pip install check successful')
+
         else:
-            print('Pip not present, cannot check install')
+            print('venv not present, cannot check install')
 
         #
 

{omdev-0.0.0.dev357 → omdev-0.0.0.dev359/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev357
+Version: 0.0.0.dev359
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev357
+Requires-Dist: omlish==0.0.0.dev359
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev357 → omdev-0.0.0.dev359}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev357
+omlish==0.0.0.dev359
 
 [all]
 black~=25.1

{omdev-0.0.0.dev357 → omdev-0.0.0.dev359}/pyproject.toml

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