omdev 0.0.0.dev113__py3-none-any.whl → 0.0.0.dev114__py3-none-any.whl

omdev/.manifests.json

@@ -51,7 +51,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 103,
+    "line": 111,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cli",
@@ -306,7 +306,7 @@
     "module": ".tools.pip",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/pip.py",
-    "line": 164,
+    "line": 120,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "pip",

omdev/cli/clicli.py

@@ -1,6 +1,5 @@
 import inspect
 import os
-import subprocess
 import sys
 import urllib.parse
 import urllib.request
@@ -8,6 +7,8 @@ import urllib.request
 from omlish import __about__
 from omlish import argparse as ap
 
+from ..pip import get_root_dists
+from ..pip import lookup_latest_package_version
 from . import install
 from .types import CliModule
 
@@ -50,21 +51,18 @@ class CliCli(ap.Cli):
         ap.arg('extra_deps', nargs='*'),
     )
     def reinstall(self) -> None:
-        mod_name = globals()['__spec__'].name
-        tool_name = '.'.join([mod_name.partition('.')[0], 'tools', 'pip'])
+        latest_version = lookup_latest_package_version(__package__.split('.')[0])
 
-        out = subprocess.check_output([
-            sys.executable,
-            '-m',
-            tool_name,
-            'list-root-dists',
-        ]).decode()
+        #
 
+        root_dists = get_root_dists()
         deps = sorted(
-            ({s for l in out.splitlines() if (s := l.strip())} | set(self.args.extra_deps or []))
+            (set(root_dists) | set(self.args.extra_deps or []))
             - {install.DEFAULT_CLI_PKG}  # noqa
         )
 
+        #
+
         if deps:
             print('Reinstalling with following additional dependencies:')
             print('\n'.join('  ' + d for d in deps))
@@ -72,12 +70,22 @@ class CliCli(ap.Cli):
             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(f'Current version: {__about__.__version__}')
+        print(f'Latest version: {latest_version}')
+        print()
+
+        #
+
         print('Continue with reinstall? (ctrl-c to cancel)')
         input()
 

omdev/pip.py

@@ -0,0 +1,77 @@
+import importlib.metadata
+import io
+import sys
+import typing as ta
+import urllib.request
+
+from omlish import check
+from omlish import lang
+
+from .packaging.names import canonicalize_name
+from .packaging.requires import RequiresVariable
+from .packaging.requires import parse_requirement
+
+
+if ta.TYPE_CHECKING:
+    import xml.etree.ElementTree as ET  # noqa
+else:
+    ET = lang.proxy_import('xml.etree.ElementTree')
+
+
+##
+
+
+DEFAULT_PYPI_URL = 'https://pypi.org/'
+
+
+def lookup_latest_package_version(
+        package: str,
+        *,
+        pypi_url: str = DEFAULT_PYPI_URL,
+) -> str:
+    pkg_name = check.non_empty_str(package)
+    with urllib.request.urlopen(f'{pypi_url}rss/project/{pkg_name}/releases.xml') as resp:  # noqa
+        rss = resp.read()
+    doc = ET.parse(io.BytesIO(rss))  # noqa
+    latest = check.not_none(doc.find('./channel/item/title')).text
+    return check.non_empty_str(latest)
+
+
+##
+
+
+def get_root_dists(
+        *,
+        paths: ta.Iterable[str] | None = None,
+) -> ta.Sequence[str]:
+    # FIXME: track req extras - tuple[str, str] with ('pkg', '') as 'bare'?
+    if paths is None:
+        paths = sys.path
+
+    dists: set[str] = set()
+    reqs_by_use: dict[str, set[str]] = {}
+    uses_by_req: dict[str, set[str]] = {}
+    for dist in importlib.metadata.distributions(paths=paths):
+        dist_cn = canonicalize_name(dist.metadata['Name'], validate=True)
+        if dist_cn in dists:
+            # raise NameError(dist_cn)
+            # print(f'!! duplicate dist: {dist_cn}', file=sys.stderr)
+            continue
+
+        dists.add(dist_cn)
+        for req_str in dist.requires or []:
+            req = parse_requirement(req_str)
+
+            if any(v.value == 'extra' for m in req.marker or [] if isinstance(v := m[0], RequiresVariable)):
+                continue
+
+            req_cn = canonicalize_name(req.name)
+            reqs_by_use.setdefault(dist_cn, set()).add(req_cn)
+            uses_by_req.setdefault(req_cn, set()).add(dist_cn)
+
+    roots: list[str] = []
+    for d in sorted(dists):
+        if not uses_by_req.get(d):
+            roots.append(d)
+
+    return roots

omdev/tools/pip.py

@@ -3,34 +3,20 @@ TODO:
  - https://github.com/pypa/pip/blob/420435903ff2fc694d6950a47b896427ecaed78f/src/pip/_internal/req/req_file.py ?
 """
 import contextlib
-import importlib.metadata
-import io
 import os.path
 import sys
 import typing as ta
-import urllib.request
 
 from omlish import argparse as ap
-from omlish import check
-from omlish import lang
 from omlish import marshal as msh
 from omlish.formats import json
 
 from ..cli import CliModule
 from ..packaging import marshal as _  # noqa
-from ..packaging.names import canonicalize_name
 from ..packaging.requires import ParsedRequirement
-from ..packaging.requires import RequiresVariable
 from ..packaging.requires import parse_requirement
-
-
-if ta.TYPE_CHECKING:
-    import xml.etree.ElementTree as ET  # noqa
-else:
-    ET = lang.proxy_import('xml.etree.ElementTree')
-
-
-PYPI_URL = 'https://pypi.org/'
+from ..pip import get_root_dists
+from ..pip import lookup_latest_package_version
 
 
 class Cli(ap.Cli):
@@ -38,12 +24,14 @@ class Cli(ap.Cli):
         ap.arg('package'),
     )
     def lookup_latest_version(self) -> None:
-        pkg_name = check.non_empty_str(self.args.package)
-        with urllib.request.urlopen(f'{PYPI_URL}rss/project/{pkg_name}/releases.xml') as resp:  # noqa
-            rss = resp.read()
-        doc = ET.parse(io.BytesIO(rss))  # noqa
-        latest = check.not_none(doc.find('./channel/item/title')).text
-        print(latest)
+        print(lookup_latest_package_version(self.args.package))
+
+    @ap.command(
+        ap.arg('path', nargs='*'),
+    )
+    def list_root_dists(self) -> None:
+        for d in get_root_dists(paths=self.args.path):
+            print(d)
 
     @ap.command(
         ap.arg('file'),
@@ -69,38 +57,6 @@ class Cli(ap.Cli):
             with open(self.args.file, 'w') as f:
                 f.write(new_src)
 
-    @ap.command(
-        ap.arg('path', nargs='*'),
-    )
-    def list_root_dists(self) -> None:
-        # FIXME: track req extras - tuple[str, str] with ('pkg', '') as 'bare'?
-        paths = self.args.path or sys.path
-
-        dists: set[str] = set()
-        reqs_by_use: dict[str, set[str]] = {}
-        uses_by_req: dict[str, set[str]] = {}
-        for dist in importlib.metadata.distributions(paths=paths):
-            dist_cn = canonicalize_name(dist.metadata['Name'], validate=True)
-            if dist_cn in dists:
-                # raise NameError(dist_cn)
-                # print(f'!! duplicate dist: {dist_cn}', file=sys.stderr)
-                continue
-
-            dists.add(dist_cn)
-            for req_str in dist.requires or []:
-                req = parse_requirement(req_str)
-
-                if any(v.value == 'extra' for m in req.marker or [] if isinstance(v := m[0], RequiresVariable)):
-                    continue
-
-                req_cn = canonicalize_name(req.name)
-                reqs_by_use.setdefault(dist_cn, set()).add(req_cn)
-                uses_by_req.setdefault(req_cn, set()).add(dist_cn)
-
-        for d in sorted(dists):
-            if not uses_by_req.get(d):
-                print(d)
-
     @ap.command(
         ap.arg('files', nargs='*'),
         ap.arg('-r', '--follow-requirements', action='store_true'),

{omdev-0.0.0.dev113.dist-info → omdev-0.0.0.dev114.dist-info}/METADATA

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

{omdev-0.0.0.dev113.dist-info → omdev-0.0.0.dev114.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=CYQZv4g8omAD0yoqcBx5TU55gcBdD4B3aVbcOLLawiQ,7479
+omdev/.manifests.json,sha256=asjeEXptONz5RkbuMIgHMDGB8QlWRazdWpFEVMznbPM,7479
 omdev/__about__.py,sha256=n5x-SO70OgbDQFzQ1d7sZDVMsnkQc4PxQZPFaIQFa0E,1281
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
@@ -7,6 +7,7 @@ omdev/cmake.py,sha256=Diy2ry65806dQP125DAstD3w46z_wszMH7PwC2-6iik,4578
 omdev/findimports.py,sha256=2t8QP852saEEJFeXySEzhi_nxRSxghlkXz2jVdvy08M,2392
 omdev/git.py,sha256=B3gnqL75OZqwMvANdZL3cyah6izdM5bZfPJhG134lD0,10520
 omdev/imgur.py,sha256=il12R3t19tALolteYCZywvcdQUEOcgvPyUYgWtKiqt4,2993
+omdev/pip.py,sha256=gRg07NCEjTquOQwnKKgXqfn_YGElO5Pi7hmrAh-AVvQ,2105
 omdev/revisions.py,sha256=U657hf4zeEN32y3g4CzqCAodx_HlfkHj2cIIKALNFDo,5009
 omdev/secrets.py,sha256=bcquaBIDKqX4UIKOzUuKrX7nxVCenj67rRHIMIrd9bk,540
 omdev/tokens.py,sha256=GusxQ1Cd_eiScuR8XTTtc9QFhOgYviYGBZmFnn3Hj7s,756
@@ -60,7 +61,7 @@ omdev/cexts/_distutils/compilers/unixccompiler.py,sha256=o1h8QuyupLntv4F21_XjzAZ
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=kxqb2kHap68Lkh8b211rDbcgj06hidBiAKA3f9posyc,2119
-omdev/cli/clicli.py,sha256=oD54mXX-j9UeeCIW2640m8ip5LtAqQvT0hJRbl1zmf8,2874
+omdev/cli/clicli.py,sha256=OOxlCg7yoV1f8X9MUzl-k26p3PRSqJmGD6TrimYPFv8,2923
 omdev/cli/install.py,sha256=C-W171YlIHt4Cfok-nWSMbHwWhqF_PFqq2HixFttYx8,4460
 omdev/cli/main.py,sha256=nD3bW3MkI0KuDSLpX_PTnl-lBnm4hIxVqczvvMHtupo,7058
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
@@ -135,16 +136,16 @@ omdev/tools/git.py,sha256=sj3I8chXVzcZQyBIP8trq5_96EOXNTmu5YPOWePkR9A,5995
 omdev/tools/importscan.py,sha256=QeGjR3UGcuuuDUiisFuAXWHlcKJScGxGEcU6tfOh2CM,4069
 omdev/tools/mkrelimp.py,sha256=wsJAjTIf3nqcSfnT9TkDpS1VUOoM9W2Az5tZdWuzyLM,4054
 omdev/tools/notebook.py,sha256=M8Xi_gfZdlahnyFLtp0RBgYZPSHWQStMMDYZc71Zync,3494
-omdev/tools/pip.py,sha256=_O7WAACQ1F1ffH4ogZHcppT4P8VQxWQchJMLn9FvsJc,5073
+omdev/tools/pip.py,sha256=cRYKRCjuMI9SR1CBORBbOCePyildLiCIMCECvBDY61E,3471
 omdev/tools/prof.py,sha256=8ZU9x_Dq8eT2ZFwU9sJpDIvxcIn9qBc8y2ELKPb5e5M,1382
 omdev/tools/qr.py,sha256=tm68lPwEAkEwIL2sUKPKBYfwwPtjVWG1DBZwur8_jY8,1737
 omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
 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=Eckymn22GfychCQcQi96BFqRo_LmiJ-EPhC8TTUJdB4,11446
-omdev-0.0.0.dev113.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev113.dist-info/METADATA,sha256=OEbh_tGsx98S71e87wp4wNTZkVEVZLj8_rpjpiAPQo0,1810
-omdev-0.0.0.dev113.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
-omdev-0.0.0.dev113.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev113.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev113.dist-info/RECORD,,
+omdev-0.0.0.dev114.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev114.dist-info/METADATA,sha256=AuvmLYtU1KklORHYLnpp8MhgEiwN4CPvzsiuxKhdwkQ,1810
+omdev-0.0.0.dev114.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+omdev-0.0.0.dev114.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev114.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev114.dist-info/RECORD,,