omdev 0.0.0.dev508__tar.gz → 0.0.0.dev510__tar.gz

{omdev-0.0.0.dev508/omdev.egg-info → omdev-0.0.0.dev510}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev508
+Version: 0.0.0.dev510
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,10 +14,10 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev508
+Requires-Dist: omlish==0.0.0.dev510
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
-Requires-Dist: pycparser~=2.23; extra == "all"
+Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: docutils~=0.22; extra == "all"
 Requires-Dist: markdown-it-py~=4.0; extra == "all"
@@ -33,7 +33,7 @@ Requires-Dist: textual-speedups~=0.2; extra == "all"
 Provides-Extra: black
 Requires-Dist: black~=26.1; extra == "black"
 Provides-Extra: c
-Requires-Dist: pycparser~=2.23; extra == "c"
+Requires-Dist: pycparser~=3.0; extra == "c"
 Requires-Dist: pcpp~=1.30; extra == "c"
 Provides-Extra: doc
 Requires-Dist: docutils~=0.22; extra == "doc"

{omdev-0.0.0.dev508 → omdev-0.0.0.dev510}/omdev/.omlish-manifests.json

@@ -27,7 +27,7 @@
     "module": ".cexts.cmake",
     "attr": "_CLI_MODULE",
     "file": "omdev/cexts/cmake.py",
-    "line": 365,
+    "line": 375,
     "value": {
       "!.cli.types.CliModule": {
         "name": "cmake",

{omdev-0.0.0.dev508 → omdev-0.0.0.dev510}/omdev/__about__.py

@@ -17,7 +17,7 @@ class Project(ProjectBase):
         ],
 
         'c': [
-            'pycparser ~= 2.23',
+            'pycparser ~= 3.0',
             'pcpp ~= 1.30',
         ],
 

{omdev-0.0.0.dev508 → omdev-0.0.0.dev510}/omdev/cexts/cmake.py

@@ -139,6 +139,15 @@ class CmakeProjectGen:
         with open(os.path.join(self.cmake_dir(), '.gitignore'), 'w') as f:
             f.write('\n'.join(sorted(['/cmake-*', '/build'])))
 
+    def add_root_symlinks(self) -> None:
+        for fn in [
+            '.clang-tidy',
+        ]:
+            check.state(os.path.isfile(sfp := os.path.abspath(os.path.join(self._prj_root, fn))))
+            dfp = os.path.join(self.cmake_dir(), fn)
+            rp = os.path.relpath(os.path.abspath(sfp), self.cmake_dir())
+            os.symlink(rp, dfp)
+
     #
 
     @dc.dataclass(frozen=True, kw_only=True)
@@ -339,6 +348,7 @@ class CmakeProjectGen:
 
         self.cmake_dir()
         self.write_git_ignore()
+        self.add_root_symlinks()
 
         out = io.StringIO()
         clg = self._CmakeListsGen(self, out)

omdev-0.0.0.dev510/omdev/clipboard/__init__.py

@@ -0,0 +1,18 @@
+from .commands import (  # noqa
+    TextCommandClipboard,
+
+    XclipLinuxClipboard,
+    PbcopyDarwinClipboard,
+)
+
+from .types import (  # noqa
+    ClipboardContents,
+    TextClipboardContents,
+    ImageClipboardContents,
+
+    Clipboard,
+)
+
+from .platform import (  # noqa
+    get_platform_clipboard,
+)

{omdev-0.0.0.dev508/omdev/clipboard → omdev-0.0.0.dev510/omdev/clipboard/capi}/darwin_cf.py

@@ -3,12 +3,12 @@ import ctypes as ct
 import dataclasses as dc
 import typing as ta
 
-from ..capi.darwin import aps
-from ..capi.darwin import cf
-from .clipboard import Clipboard
-from .clipboard import ClipboardContents
-from .clipboard import ImageClipboardContents
-from .clipboard import TextClipboardContents
+from ...capi.darwin import aps
+from ...capi.darwin import cf
+from ..types import Clipboard
+from ..types import ClipboardContents
+from ..types import ImageClipboardContents
+from ..types import TextClipboardContents
 
 
 ##

{omdev-0.0.0.dev508/omdev/clipboard → omdev-0.0.0.dev510/omdev/clipboard/capi}/linux_x11.py

@@ -2,7 +2,7 @@
 # flake8: noqa: E302 E305
 import ctypes as ct
 
-from ..capi.linux import x11
+from ...capi.linux import x11
 
 
 ##

omdev-0.0.0.dev508/omdev/clipboard/clipboard.py → omdev-0.0.0.dev510/omdev/clipboard/commands.py

@@ -1,42 +1,12 @@
-""" https://askubuntu.com/questions/11925/a-command-line-clipboard-copy-and-paste-utility
-"""
 import abc
-import dataclasses as dc
 import subprocess
 import typing as ta
 
 from omlish import lang
 
-
-##
-
-
-@dc.dataclass(frozen=True)
-class ClipboardContents(lang.Abstract):
-    pass
-
-
-@dc.dataclass(frozen=True)
-class TextClipboardContents(ClipboardContents):
-    s: str
-
-
-@dc.dataclass(frozen=True)
-class ImageClipboardContents(ClipboardContents):
-    b: bytes
-
-
-##
-
-
-class Clipboard(lang.Abstract):
-    @abc.abstractmethod
-    def get(self) -> list[ClipboardContents]:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def put(self, c: ClipboardContents) -> None:
-        raise NotImplementedError
+from .types import Clipboard
+from .types import ClipboardContents
+from .types import TextClipboardContents
 
 
 ##
@@ -64,6 +34,9 @@ class TextCommandClipboard(Clipboard, lang.Abstract):
             raise TypeError(c)
 
 
+#
+
+
 class XclipLinuxClipboard(TextCommandClipboard):
     _get_cmd = ('xclip', '-selection', 'clipboard', '-o')
     _put_cmd = ('xclip', '-selection', 'clipboard')

omdev-0.0.0.dev510/omdev/clipboard/platform.py

@@ -0,0 +1,21 @@
+import platform
+
+from omlish import lang
+
+from .commands import PbcopyDarwinClipboard
+from .commands import XclipLinuxClipboard
+from .types import Clipboard
+
+
+##
+
+
+@lang.cached_function
+def get_platform_clipboard() -> Clipboard | None:
+    match platform.system():
+        case 'Darwin':
+            return PbcopyDarwinClipboard()
+        case 'Linux':
+            return XclipLinuxClipboard()
+        case _:
+            return None

omdev-0.0.0.dev510/omdev/clipboard/types.py

@@ -0,0 +1,38 @@
+"""
+https://askubuntu.com/questions/11925/a-command-line-clipboard-copy-and-paste-utility
+"""
+import abc
+import dataclasses as dc
+
+from omlish import lang
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class ClipboardContents(lang.Abstract):
+    pass
+
+
+@dc.dataclass(frozen=True)
+class TextClipboardContents(ClipboardContents):
+    s: str
+
+
+@dc.dataclass(frozen=True)
+class ImageClipboardContents(ClipboardContents):
+    b: bytes
+
+
+##
+
+
+class Clipboard(lang.Abstract):
+    @abc.abstractmethod
+    def get(self) -> list[ClipboardContents]:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def put(self, c: ClipboardContents) -> None:
+        raise NotImplementedError

{omdev-0.0.0.dev508 → omdev-0.0.0.dev510}/omdev/py/tools/pipdepup.py

@@ -327,6 +327,10 @@ class Package:
     unfiltered_candidates: ta.Sequence[Candidate] | None = None
     candidates: ta.Sequence[Candidate] | None = None
 
+    @cached.function
+    def candidates_by_version(self) -> ta.Mapping[Version, ta.Sequence[Candidate]]:
+        return col.multi_map_by(lambda c: c.version, check.not_none(self.candidates))
+
     latest_candidate: Candidate | None = None
     suggested_candidate: Candidate | None = None
 
@@ -511,7 +515,9 @@ def format_for_columns(pkgs: ta.Sequence[Package]) -> tuple[list[list[str]], lis
 
     header = [
         'Package',
+
         'Current',
+        'Age',
 
         'Suggested',
         'Age',
@@ -543,9 +549,19 @@ def format_for_columns(pkgs: ta.Sequence[Package]) -> tuple[list[list[str]], lis
 
         row = [
             pkg.dist.raw_name,
+
             pkg.dist.raw_version,
         ]
 
+        if (
+                (cs := pkg.candidates_by_version().get(pkg.dist.version)) and
+                # FIXME: lame and wrong lol
+                (c_ut := cs[0].upload_time()) is not None
+        ):
+            row.append(human_round_td(now_utc() - c_ut))
+        else:
+            row.append('')
+
         def add_c(c):
             if c is None:
                 row.extend(['', ''])

{omdev-0.0.0.dev508 → omdev-0.0.0.dev510}/omdev/tui/textual/__init__.py

@@ -231,6 +231,10 @@ with _lang.auto_proxy_init(globals()):
 
     ##
 
+    from .clipboard import (  # noqa
+        ClipboardAppMixin,
+    )
+
     from . devtools import (  # noqa
         DevtoolsConfig,
         connect_devtools,

{omdev-0.0.0.dev508 → omdev-0.0.0.dev510}/omdev/tui/textual/app2.py

@@ -3,14 +3,9 @@ import typing as ta
 from textual.app import App as App_
 from textual.binding import BindingType  # noqa
 
-from .devtools import DevtoolsAppMixin
-
 
 ##
 
 
-class App(
-    DevtoolsAppMixin,
-    App_,
-):
+class App(App_):
     BINDINGS: ta.ClassVar[ta.Sequence[BindingType]] = App_.BINDINGS  # type: ignore[assignment]

omdev-0.0.0.dev510/omdev/tui/textual/clipboard.py

@@ -0,0 +1,39 @@
+import typing as ta
+
+from ...clipboard import Clipboard
+from ...clipboard import TextClipboardContents
+from ...clipboard import get_platform_clipboard
+
+
+if ta.TYPE_CHECKING:
+    from textual.driver import Driver
+
+
+##
+
+
+class ClipboardAppMixin:
+    _driver: ta.Optional['Driver']
+    _clipboard: str
+
+    #
+
+    _clipboard_api_: Clipboard | None
+
+    def _clipboard_api(self) -> Clipboard | None:
+        try:
+            return self._clipboard_api_
+        except AttributeError:
+            pass
+        self._clipboard_api_ = get_platform_clipboard()
+        return self._clipboard_api_
+
+    #
+
+    def copy_to_clipboard(self, text: str) -> None:
+        if (cb_api := self._clipboard_api()) is None:
+            super().copy_to_clipboard(text)  # type: ignore
+            return
+
+        self._clipboard = text
+        cb_api.put(TextClipboardContents(text))

{omdev-0.0.0.dev508 → omdev-0.0.0.dev510/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev508
+Version: 0.0.0.dev510
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,10 +14,10 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev508
+Requires-Dist: omlish==0.0.0.dev510
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
-Requires-Dist: pycparser~=2.23; extra == "all"
+Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: docutils~=0.22; extra == "all"
 Requires-Dist: markdown-it-py~=4.0; extra == "all"
@@ -33,7 +33,7 @@ Requires-Dist: textual-speedups~=0.2; extra == "all"
 Provides-Extra: black
 Requires-Dist: black~=26.1; extra == "black"
 Provides-Extra: c
-Requires-Dist: pycparser~=2.23; extra == "c"
+Requires-Dist: pycparser~=3.0; extra == "c"
 Requires-Dist: pcpp~=1.30; extra == "c"
 Provides-Extra: doc
 Requires-Dist: docutils~=0.22; extra == "doc"

{omdev-0.0.0.dev508 → omdev-0.0.0.dev510}/omdev.egg-info/SOURCES.txt

@@ -132,9 +132,12 @@ omdev/cli/main.py
 omdev/cli/managers.py
 omdev/cli/types.py
 omdev/clipboard/__init__.py
-omdev/clipboard/clipboard.py
-omdev/clipboard/darwin_cf.py
-omdev/clipboard/linux_x11.py
+omdev/clipboard/commands.py
+omdev/clipboard/platform.py
+omdev/clipboard/types.py
+omdev/clipboard/capi/__init__.py
+omdev/clipboard/capi/darwin_cf.py
+omdev/clipboard/capi/linux_x11.py
 omdev/cmdlog/__init__.py
 omdev/cmdlog/__main__.py
 omdev/cmdlog/_cmdlog.py
@@ -379,6 +382,7 @@ omdev/tui/rich/console2.py
 omdev/tui/rich/markdown2.py
 omdev/tui/textual/__init__.py
 omdev/tui/textual/app2.py
+omdev/tui/textual/clipboard.py
 omdev/tui/textual/devtools.py
 omdev/tui/textual/drivers2.py
 omdev/tui/textual/logging2.py

{omdev-0.0.0.dev508 → omdev-0.0.0.dev510}/omdev.egg-info/requires.txt

@@ -1,8 +1,8 @@
-omlish==0.0.0.dev508
+omlish==0.0.0.dev510
 
 [all]
 black~=26.1
-pycparser~=2.23
+pycparser~=3.0
 pcpp~=1.30
 docutils~=0.22
 markdown-it-py~=4.0
@@ -20,7 +20,7 @@ textual-speedups~=0.2
 black~=26.1
 
 [c]
-pycparser~=2.23
+pycparser~=3.0
 pcpp~=1.30
 
 [doc]

{omdev-0.0.0.dev508 → omdev-0.0.0.dev510}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev508'
+version = '0.0.0.dev510'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,13 +24,13 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev508',
+    'omlish == 0.0.0.dev510',
 ]
 
 [project.optional-dependencies]
 all = [
     'black ~= 26.1',
-    'pycparser ~= 2.23',
+    'pycparser ~= 3.0',
     'pcpp ~= 1.30',
     'docutils ~= 0.22',
     'markdown-it-py ~= 4.0',
@@ -48,7 +48,7 @@ black = [
     'black ~= 26.1',
 ]
 c = [
-    'pycparser ~= 2.23',
+    'pycparser ~= 3.0',
     'pcpp ~= 1.30',
 ]
 doc = [