omdev 0.0.0.dev358__tar.gz → 0.0.0.dev360__tar.gz

{omdev-0.0.0.dev358/omdev.egg-info → omdev-0.0.0.dev360}/PKG-INFO

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

{omdev-0.0.0.dev358 → omdev-0.0.0.dev360}/omdev/.manifests.json

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

{omdev-0.0.0.dev358 → omdev-0.0.0.dev360}/omdev/cli/clicli.py

@@ -114,8 +114,8 @@ class CliCli(ap.Cli):
 
         #
 
-        if lang.can_import('pip'):
-            print('Checking pip install')
+        if lang.can_import('venv'):
+            print('Checking venv install')
 
             with temp_dir_context() as tmp_dir:
                 venv_dir = os.path.join(tmp_dir, 'venv')
@@ -126,17 +126,17 @@ class CliCli(ap.Cli):
                 ])
                 venv_exe = os.path.join(venv_dir, 'bin', 'python')
 
+                subprocess.check_call([
+                    venv_exe,
+                    '-m', 'ensurepip',
+                    '--upgrade',
+                ])
+
                 if self.args.no_uv:
-                    subprocess.check_call([
+                    pip_install_cmd = [
                         venv_exe,
                         '-m', 'pip',
                         'install',
-                        '--upgrade',
-                        'pip',
-                    ])
-                    pip_cmd = [
-                        venv_exe,
-                        '-m', 'pip',
                     ]
                 else:
                     subprocess.check_call([
@@ -145,24 +145,25 @@ class CliCli(ap.Cli):
                         'install',
                         'uv',
                     ])
-                    pip_cmd = [
+                    pip_install_cmd = [
                         venv_exe,
                         '-m', 'uv',
                         'pip',
+                        'install',
+                        '--refresh',
                     ]
 
                 subprocess.check_call([
-                    *pip_cmd,
-                    'install',
+                    *pip_install_cmd,
                     '--dry-run',
                     f'{install.DEFAULT_CLI_PKG}=={target_version}',
                     *deps,
                 ])
 
-                print('Pip install check successful')
+                print('venv install check successful')
 
         else:
-            print('Pip not present, cannot check install')
+            print('venv not present, cannot check install')
 
         #
 

{omdev-0.0.0.dev358 → omdev-0.0.0.dev360/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev358 → omdev-0.0.0.dev360}/omdev.egg-info/requires.txt

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

{omdev-0.0.0.dev358 → omdev-0.0.0.dev360}/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.dev358'
+version = '0.0.0.dev360'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev358',
+    'omlish == 0.0.0.dev360',
 ]
 
 [project.optional-dependencies]