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

omdev/.manifests.json

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

omdev/cli/clicli.py

@@ -2,6 +2,8 @@ import inspect
 import os
 import subprocess
 import sys
+import urllib.parse
+import urllib.request
 
 from omlish import __about__
 from omlish import argparse as ap
@@ -10,6 +12,9 @@ from . import install
 from .types import CliModule
 
 
+DEFAULT_REINSTALL_URL = 'https://raw.githubusercontent.com/wrmsr/omlish/master/omdev/cli/install.py'
+
+
 class CliCli(ap.Cli):
 
     @ap.command(name='version')
@@ -21,6 +26,8 @@ class CliCli(ap.Cli):
         print(__about__.__revision__)
 
     @ap.command(
+        ap.arg('--url', default=DEFAULT_REINSTALL_URL),
+        ap.arg('--local', action='store_true'),
         ap.arg('extra_deps', nargs='*'),
     )
     def reinstall(self) -> None:
@@ -45,10 +52,25 @@ class CliCli(ap.Cli):
         else:
             print('No additional dependencies detected.')
         print()
+
+        if self.args.local:
+            print('Reinstalling from local installer.')
+        else:
+            print(f'Reinstalling from script url: {self.args.url}')
+        print()
+
         print('Continue with reinstall? (ctrl-c to cancel)')
         input()
 
-        install_src = inspect.getsource(install)
+        if self.args.local:
+            install_src = inspect.getsource(install)
+        else:
+            url = self.args.url
+            parsed = urllib.parse.urlparse(url)
+            if parsed.scheme not in ('https', 'file'):
+                raise RuntimeError(f'Insecure url schem: {url}')
+            with urllib.request.urlopen(urllib.request.Request(url)) as resp:  # noqa
+                install_src = resp.read().decode('utf-8')
 
         os.execl(
             sys.executable,

omdev/cli/install.py

@@ -2,11 +2,6 @@
 # @omlish-lite
 # @omlish-script
 """
-TODO:
- - used for self-reinstall, preserving non-root dists - fix list_root_dists
-
-==
-
 curl -LsSf https://raw.githubusercontent.com/wrmsr/omlish/master/omdev/cli/install.py | python3 -
 """
 import abc

omdev/cli/main.py

@@ -3,8 +3,6 @@ TODO:
  - cache ldr.discover() somehow if in uvx/pipx - very slow
   - <venv-root>/.omdev-cli-manifest-cache.json - {pkg_name: manifests_json}
  - allow manually specifying manifest packages
- - https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#creating-executable-scripts
- - https://packaging.python.org/en/latest/specifications/entry-points/#entry-points
 """
 import argparse
 import os

omdev/cli/managers.py

@@ -52,7 +52,7 @@ def detect_install_manager(cli_pkg: str) -> ManagerType | None:
 # code runs before the problematic empty string is added, so a sys.meta_path hook is prepended.
 #
 # See:
-#     https://github.com/python/cpython/blob/da1e5526aee674bb33c17a498aa3781587b9850c/Python/sysmodule.c#L3939
+#   https://github.com/python/cpython/blob/da1e5526aee674bb33c17a498aa3781587b9850c/Python/sysmodule.c#L3939
 
 
 def _remove_empty_from_sys_path() -> None:

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

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

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

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=VjSjb16bBoHODQU_kmP3YULw0wclMsAiHbk4dH-kyLk,3918
+omdev/.manifests.json,sha256=USbXWQli6UL2kI-4rVbhvFpACSOdpz5WNyKlVl6aEHI,3918
 omdev/__about__.py,sha256=LqSNNFFcT84xW3W8fIOJ78kPYJKFLIXZyDX-AJREvN0,1005
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=HwBK5XmlOsF_juTel25fRLJK9vHSJCWXuCc-OZlevRQ,2619
@@ -55,10 +55,10 @@ omdev/cexts/_distutils/compilers/options.py,sha256=H7r5IcLvga5Fs3jjXWIT-6ap3JBdu
 omdev/cexts/_distutils/compilers/unixccompiler.py,sha256=o1h8QuyupLntv4F21_XjzAZmCiwwxJuTmOirvBSL-Qw,15419
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 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=qCxIMWbaLZCEIlpK6fe-A7gFBAeBYpde5icahTg9fP8,2592
+omdev/cli/clicli.py,sha256=rQ9-F9XI3BevnfIVALHVKrrHNQPdYhkQ-IKESTNB5RA,2447
+omdev/cli/install.py,sha256=C-W171YlIHt4Cfok-nWSMbHwWhqF_PFqq2HixFttYx8,4460
+omdev/cli/main.py,sha256=wVhrzwEfUFKjlfSeJK5CM23yId4v3-36IuY4VbrOSQA,1873
+omdev/cli/managers.py,sha256=zqhMgNnv2VbXoTP6SgZeSuWfAVo1Ge-HJnQ1ftL-Mq8,2590
 omdev/cli/types.py,sha256=7_Owg0P8C8oOObSuOp6aEYSjkEukVFxTT00SRy1bLHM,250
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
@@ -113,9 +113,9 @@ 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.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,,
+omdev-0.0.0.dev50.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev50.dist-info/METADATA,sha256=r8KcmIB1fJC0Zwwnyzc8aCC3ay7_8giMYiC4dW0ULQE,1252
+omdev-0.0.0.dev50.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omdev-0.0.0.dev50.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev50.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev50.dist-info/RECORD,,