omdev 0.0.0.dev358__py3-none-any.whl → 0.0.0.dev360__py3-none-any.whl

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/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.dist-info → omdev-0.0.0.dev360.dist-info}/METADATA

@@ -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.dist-info → omdev-0.0.0.dev360.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=PxRZUh3EU4dPbwgNrNqPp-TIHB-3VS2HsZPu6GDUXXM,11870
+omdev/.manifests.json,sha256=s65bqpkuAoDNYA0eQoGcMEtFtlUL4TtDsMq04sVJnCQ,11870
 omdev/__about__.py,sha256=2_6pQyjxqAspvwBSJUWQgdBBcGaDO3zX8yETLaspUQE,1202
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=9rfSvFHPmKDj9ngvfDB2vK8O-xO_ZwUm7hMKLWA-yOw,4578
@@ -103,7 +103,7 @@ omdev/ci/github/api/v2/client.py,sha256=bJtL_TZ4sB6IDuzfqtEXj-iWivKfyXQZ_MO30lgB
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=UshIZX3oeXq0De-9X28gy2LgKMZDf_dzabdkUhZJdNA,2124
-omdev/cli/clicli.py,sha256=h4VOvjZUVFdOP_24gVbZ3yXTZlYUbssRytY9do7mka4,6266
+omdev/cli/clicli.py,sha256=eSQk5CQIoPe29zclCHHful4aAhvxg7fc3eeADEFxqzE,6291
 omdev/cli/install.py,sha256=oB34AOwu07sqEztW_z5mgorAFoP_Tw556XiTPj2WSM0,4904
 omdev/cli/main.py,sha256=dxZFyzKuwRykHHhoKKUA0fUa9QsY0dgdvLHbXNuIPCY,6694
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
@@ -303,9 +303,9 @@ omdev/tools/jsonview/resources/jsonview.js,sha256=faDvXDOXKvEvjOuIlz4D3F2ReQXb_b
 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=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev358.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev358.dist-info/METADATA,sha256=YH05yXpBiR3bibpsm2-Dpd1Z749qHhnmbEw3E967cs0,1674
-omdev-0.0.0.dev358.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev358.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev358.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev358.dist-info/RECORD,,
+omdev-0.0.0.dev360.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev360.dist-info/METADATA,sha256=p8OqlGNVnsfnGcOV_1uzng5KNL_Awa08UoYzBODxgTM,1674
+omdev-0.0.0.dev360.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev360.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev360.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev360.dist-info/RECORD,,