omdev 0.0.0.dev36__tar.gz → 0.0.0.dev38__tar.gz

{omdev-0.0.0.dev36/omdev.egg-info → omdev-0.0.0.dev38}/PKG-INFO

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

{omdev-0.0.0.dev36 → omdev-0.0.0.dev38}/omdev/.manifests.json

@@ -99,7 +99,7 @@
     "module": ".tools.piptools",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/piptools.py",
-    "line": 51,
+    "line": 87,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "pip",

{omdev-0.0.0.dev36 → omdev-0.0.0.dev38}/omdev/amalg/amalg.py

@@ -205,6 +205,7 @@ def make_import(
 
 
 TYPE_ALIAS_COMMENT = '# ta.TypeAlias'
+NOQA_TYPE_ALIAS_COMMENT = TYPE_ALIAS_COMMENT + '  # noqa'
 
 
 @dc.dataclass(frozen=True, kw_only=True)
@@ -218,7 +219,8 @@ class Typing:
 
 
 def _is_typing(lts: Tokens) -> bool:
-    if tks.join_toks(lts).strip().endswith(TYPE_ALIAS_COMMENT):
+    es = tks.join_toks(lts).strip()
+    if any(es.endswith(sfx) for sfx in (TYPE_ALIAS_COMMENT, NOQA_TYPE_ALIAS_COMMENT)):
         return True
 
     wts = list(tks.ignore_ws(lts))

omdev-0.0.0.dev38/omdev/cli/install.py

@@ -0,0 +1,160 @@
+#!/usr/bin/env python3
+# @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
+import argparse
+import dataclasses as dc
+import itertools
+import json
+import shutil
+import subprocess
+import sys
+import typing as ta
+
+
+DEFAULT_CLI_PKG = 'omdev-cli'
+DEFAULT_PY_VER = '3.12'
+
+
+@dc.dataclass(frozen=True)
+class InstallOpts:
+    cli_pkg: str = DEFAULT_CLI_PKG
+    py_ver: str = DEFAULT_PY_VER
+
+    extras: ta.Sequence[str] = dc.field(default_factory=list)
+
+
+class InstallMgr(abc.ABC):
+    @abc.abstractmethod
+    def is_available(self) -> bool:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def uninstall(self, cli_pkg: str) -> None:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def install(self, opts: InstallOpts) -> None:
+        raise NotImplementedError
+
+
+class UvInstallMgr(InstallMgr):
+    def is_available(self) -> bool:
+        return bool(shutil.which('uv'))
+
+    def uninstall(self, cli_pkg: str) -> None:
+        out = subprocess.check_output(['uv', 'tool', 'list']).decode()
+
+        installed = {
+            s.partition(' ')[0]
+            for l in out.splitlines()
+            if (s := l.strip())
+            and not s.startswith('-')
+        }
+
+        if cli_pkg not in installed:
+            return
+
+        subprocess.check_call([
+            'uv', 'tool',
+            'uninstall',
+            cli_pkg,
+        ])
+
+    def install(self, opts: InstallOpts) -> None:
+        subprocess.check_call([
+            'uv', 'tool',
+            'install',
+            '--refresh',
+            '--prerelease=allow',
+            f'--python={opts.py_ver}',
+            opts.cli_pkg,
+            *itertools.chain.from_iterable(['--with', e] for e in (opts.extras or [])),
+        ])
+
+
+class PipxInstallMgr(InstallMgr):
+    def is_available(self) -> bool:
+        return bool(shutil.which('pipx'))
+
+    def uninstall(self, cli_pkg: str) -> None:
+        out = subprocess.check_output(['pipx', 'list', '--json']).decode()
+
+        dct = json.loads(out)
+
+        if cli_pkg not in dct.get('venvs', {}):
+            return
+
+        subprocess.check_call([
+            'pipx',
+            'uninstall',
+            cli_pkg,
+        ])
+
+    def install(self, opts: InstallOpts) -> None:
+        subprocess.check_call([
+            'pipx',
+            'install',
+            f'--python={opts.py_ver}',
+            opts.cli_pkg,
+            *itertools.chain.from_iterable(['--preinstall', e] for e in (opts.extras or [])),
+        ])
+
+
+INSTALL_MGRS = {
+    'uv': UvInstallMgr(),
+    'pipx': PipxInstallMgr(),
+}
+
+
+def _main() -> None:
+    if sys.version_info < (3, 8):  # noqa
+        raise RuntimeError(f'Unsupported python version: {sys.version_info}')
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-c', '--cli', default=DEFAULT_CLI_PKG)
+    parser.add_argument('-p', '--py', default=DEFAULT_PY_VER)
+    parser.add_argument('-m', '--mgr')
+    parser.add_argument('extra', nargs='*')
+    args = parser.parse_args()
+
+    if not (cli := args.cli):
+        raise ValueError(f'Must specify cli')
+
+    if not (py := args.py):
+        raise ValueError(f'Must specify py')
+
+    if not (mgr := args.mgr):
+        if shutil.which('uv'):
+            mgr = 'uv'
+        elif shutil.which('pipx'):
+            mgr = 'pipx'
+        else:
+            raise RuntimeError("Can't find package manager")
+
+    if (im := INSTALL_MGRS.get(mgr)) is None:
+        raise ValueError(f'Unsupported mgr: {mgr}')
+    if not im.is_available():
+        raise ValueError(f'Unavailable mgr: {mgr}')
+
+    for m in INSTALL_MGRS.values():
+        if m.is_available():
+            m.uninstall(cli)
+
+    im.install(InstallOpts(
+        cli_pkg=cli,
+        py_ver=py,
+        extras=args.extra,
+    ))
+
+
+if __name__ == '__main__':
+    _main()

{omdev-0.0.0.dev36 → omdev-0.0.0.dev38}/omdev/interp/inspect.py

@@ -8,7 +8,7 @@ import typing as ta
 from omlish.lite.logs import log
 from omlish.lite.subprocesses import subprocess_check_output
 
-from ..versioning.versions import Version
+from ..packaging.versions import Version
 from .types import InterpOpts
 from .types import InterpVersion
 

{omdev-0.0.0.dev36 → omdev-0.0.0.dev38}/omdev/interp/pyenv.py

@@ -25,8 +25,8 @@ from omlish.lite.subprocesses import subprocess_check_call
 from omlish.lite.subprocesses import subprocess_check_output_str
 from omlish.lite.subprocesses import subprocess_try_output
 
-from ..versioning.versions import InvalidVersion
-from ..versioning.versions import Version
+from ..packaging.versions import InvalidVersion
+from ..packaging.versions import Version
 from .inspect import INTERP_INSPECTOR
 from .inspect import InterpInspector
 from .providers import InterpProvider

{omdev-0.0.0.dev36 → omdev-0.0.0.dev38}/omdev/interp/system.py

@@ -12,7 +12,7 @@ import typing as ta
 from omlish.lite.cached import cached_nullary
 from omlish.lite.logs import log
 
-from ..versioning.versions import InvalidVersion
+from ..packaging.versions import InvalidVersion
 from .inspect import INTERP_INSPECTOR
 from .inspect import InterpInspector
 from .providers import InterpProvider

{omdev-0.0.0.dev36 → omdev-0.0.0.dev38}/omdev/interp/types.py

@@ -3,9 +3,9 @@ import collections
 import dataclasses as dc
 import typing as ta
 
-from ..versioning.specifiers import Specifier
-from ..versioning.versions import InvalidVersion
-from ..versioning.versions import Version
+from ..packaging.specifiers import Specifier
+from ..packaging.versions import InvalidVersion
+from ..packaging.versions import Version
 
 
 # See https://peps.python.org/pep-3149/

omdev-0.0.0.dev38/omdev/packaging/names.py

@@ -0,0 +1,44 @@
+# Copyright (c) Donald Stufft and individual contributors.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+# following conditions are met:
+#
+#     1. Redistributions of source code must retain the above copyright notice, this list of conditions and the
+#        following disclaimer.
+#
+#     2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+#        following disclaimer in the documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This file is dual licensed under the terms of the
+# Apache License, Version 2.0, and the BSD License. See the LICENSE file in the root of this repository for complete
+# details.
+# https://github.com/pypa/packaging/blob/cf2cbe2aec28f87c6228a6fb136c27931c9af407/src/packaging/utils.py
+import re
+
+
+# Core metadata spec for `Name`
+_CANONICAL_NAME_VALIDATE_PATTERN = re.compile(r'^([A-Z0-9]|[A-Z0-9][A-Z0-9._-]*[A-Z0-9])$', re.IGNORECASE)
+_CANONICAL_NAME_CANONICALIZE_PATTERN = re.compile(r'[-_.]+')
+_CANONICAL_NAME_NORMALIZED_PATTERN = re.compile(r'^([a-z0-9]|[a-z0-9]([a-z0-9-](?!--))*[a-z0-9])$')
+
+# PEP 427: The build number must start with a digit.
+_CANONICAL_NAME_BUILD_TAG_PATTERN = re.compile(r'(\d+)(.*)')
+
+
+def canonicalize_name(name: str, *, validate: bool = False) -> str:
+    if validate and not _CANONICAL_NAME_VALIDATE_PATTERN.match(name):
+        raise NameError(f'name is invalid: {name!r}')
+    # This is taken from PEP 503.
+    value = _CANONICAL_NAME_CANONICALIZE_PATTERN.sub('-', name).lower()
+    return value
+
+
+def is_normalized_name(name: str) -> bool:
+    return _CANONICAL_NAME_NORMALIZED_PATTERN.match(name) is not None