omdev 0.0.0.dev438__tar.gz → 0.0.0.dev440__tar.gz

{omdev-0.0.0.dev438/omdev.egg-info → omdev-0.0.0.dev440}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev438
+Version: 0.0.0.dev440
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev438
+Requires-Dist: omlish==0.0.0.dev440
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"
@@ -23,7 +23,7 @@ Requires-Dist: docutils~=0.22; extra == "all"
 Requires-Dist: markdown-it-py~=4.0; extra == "all"
 Requires-Dist: mdit-py-plugins~=0.5; extra == "all"
 Requires-Dist: pygments~=2.19; extra == "all"
-Requires-Dist: mypy~=1.17; extra == "all"
+Requires-Dist: mypy~=1.18; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: prompt-toolkit~=3.0; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
@@ -38,7 +38,7 @@ Requires-Dist: markdown-it-py~=4.0; extra == "doc"
 Requires-Dist: mdit-py-plugins~=0.5; extra == "doc"
 Requires-Dist: pygments~=2.19; extra == "doc"
 Provides-Extra: mypy
-Requires-Dist: mypy~=1.17; extra == "mypy"
+Requires-Dist: mypy~=1.18; extra == "mypy"
 Provides-Extra: prof
 Requires-Dist: gprof2dot~=2025.4; extra == "prof"
 Provides-Extra: ptk

{omdev-0.0.0.dev438 → omdev-0.0.0.dev440}/omdev/.omlish-manifests.json

@@ -188,7 +188,7 @@
     "module": ".py.attrdocs",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/attrdocs.py",
-    "line": 160,
+    "line": 159,
     "value": {
       "!.cli.types.CliModule": {
         "name": "py/attrdocs",

{omdev-0.0.0.dev438 → omdev-0.0.0.dev440}/omdev/__about__.py

@@ -31,7 +31,7 @@ class Project(ProjectBase):
         ],
 
         'mypy': [
-            'mypy ~= 1.17',
+            'mypy ~= 1.18',
         ],
 
         'prof': [

{omdev-0.0.0.dev438 → omdev-0.0.0.dev440}/omdev/amalg/gen/srcfiles.py

@@ -40,6 +40,17 @@ class SrcFile:
     has_binary_resources: bool = False
 
 
+def drop_amalg_comment_lines(lines: ta.Iterable[tks.Tokens]) -> list[tks.Tokens]:
+    out: list[tks.Tokens] = []
+    for l in lines:
+        cl = list(tks.ignore_ws(l, drop_nl=True, keep=['COMMENT']))
+        if len(cl) == 1 and (t := cl[0]).name == 'COMMENT':
+            if t.src.split()[1:2] == ['@omlish-amalg']:
+                continue
+        out.append(l)
+    return out
+
+
 def make_src_file(
         path: str,
         *,
@@ -51,6 +62,8 @@ def make_src_file(
     tokens = tks.src_to_tokens(src)
     lines = tks.split_lines(tokens)
 
+    lines = drop_amalg_comment_lines(lines)
+
     header_lines, cls = split_header_lines(lines)
 
     header_lines = strip_header_lines(header_lines)

{omdev-0.0.0.dev438 → omdev-0.0.0.dev440}/omdev/ci/github/api/v2/api.py

@@ -90,6 +90,7 @@ class GithubCacheServiceV2:
     class CreateCacheEntryResponse:
         ok: bool
         signed_upload_url: str
+        message: ta.Optional[str] = None
 
     CREATE_CACHE_ENTRY_METHOD: Method[
         CreateCacheEntryRequest,
@@ -113,6 +114,7 @@ class GithubCacheServiceV2:
     class FinalizeCacheEntryUploadResponse:
         ok: bool
         entry_id: str
+        message: ta.Optional[str] = None
 
     FINALIZE_CACHE_ENTRY_METHOD: Method[
         FinalizeCacheEntryUploadRequest,

{omdev-0.0.0.dev438 → omdev-0.0.0.dev440}/omdev/py/attrdocs.py

@@ -24,12 +24,11 @@ class AttrDoc:
     trailing_comment: str | None = None
     preceding_comment: str | None = None
 
-    __repr__ = lang.attr_ops(
-        'docstring',
-        'trailing_comment',
-        'preceding_comment',
-        repr_filter=bool,
-    ).repr
+    __repr__ = lang.attr_ops(lambda o: (
+        o.docstring,
+        o.trailing_comment,
+        o.preceding_comment,
+    ), repr_filter=bool).repr
 
 
 _EMPTY_ATTR_DOC = AttrDoc()

{omdev-0.0.0.dev438 → omdev-0.0.0.dev440}/omdev/scripts/ci.py

@@ -2547,6 +2547,7 @@ class GithubCacheServiceV2:
     class CreateCacheEntryResponse:
         ok: bool
         signed_upload_url: str
+        message: ta.Optional[str] = None
 
     CREATE_CACHE_ENTRY_METHOD: Method[
         CreateCacheEntryRequest,
@@ -2570,6 +2571,7 @@ class GithubCacheServiceV2:
     class FinalizeCacheEntryUploadResponse:
         ok: bool
         entry_id: str
+        message: ta.Optional[str] = None
 
     FINALIZE_CACHE_ENTRY_METHOD: Method[
         FinalizeCacheEntryUploadRequest,