omdev 0.0.0.dev48__tar.gz → 0.0.0.dev50__tar.gz

{omdev-0.0.0.dev48/omdev.egg-info → omdev-0.0.0.dev50}/PKG-INFO

@@ -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 → omdev-0.0.0.dev50}/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-0.0.0.dev48 → omdev-0.0.0.dev50}/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-0.0.0.dev48 → omdev-0.0.0.dev50}/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-0.0.0.dev48 → omdev-0.0.0.dev50}/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-0.0.0.dev48 → omdev-0.0.0.dev50}/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 → omdev-0.0.0.dev50/omdev.egg-info}/PKG-INFO

@@ -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 → omdev-0.0.0.dev50}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev48
+omlish==0.0.0.dev50
 
 [all]
 pycparser~=2.22

{omdev-0.0.0.dev48 → omdev-0.0.0.dev50}/pyproject.toml

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