omdev 0.0.0.dev438__py3-none-any.whl → 0.0.0.dev440__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (21) hide show
  1. omdev/.omlish-manifests.json +1 -1
  2. omdev/__about__.py +1 -1
  3. omdev/amalg/gen/srcfiles.py +13 -0
  4. omdev/ci/github/api/v2/api.py +2 -0
  5. omdev/py/attrdocs.py +5 -6
  6. omdev/scripts/ci.py +2 -0
  7. omdev/scripts/lib/__init__.py +0 -0
  8. omdev/scripts/lib/inject.py +2039 -0
  9. omdev/scripts/lib/logs.py +2031 -0
  10. omdev/scripts/lib/marshal.py +1689 -0
  11. omdev/tokens/utils.py +2 -1
  12. omdev/tools/git/cli.py +2 -1
  13. omdev/tools/json/cli.py +6 -6
  14. omdev/tools/json/parsing.py +5 -5
  15. omdev/tools/json/rendering.py +2 -2
  16. {omdev-0.0.0.dev438.dist-info → omdev-0.0.0.dev440.dist-info}/METADATA +4 -4
  17. {omdev-0.0.0.dev438.dist-info → omdev-0.0.0.dev440.dist-info}/RECORD +21 -17
  18. {omdev-0.0.0.dev438.dist-info → omdev-0.0.0.dev440.dist-info}/WHEEL +0 -0
  19. {omdev-0.0.0.dev438.dist-info → omdev-0.0.0.dev440.dist-info}/entry_points.txt +0 -0
  20. {omdev-0.0.0.dev438.dist-info → omdev-0.0.0.dev440.dist-info}/licenses/LICENSE +0 -0
  21. {omdev-0.0.0.dev438.dist-info → omdev-0.0.0.dev440.dist-info}/top_level.txt +0 -0
omdev/.omlish-manifests.json CHANGED
@@ -188,7 +188,7 @@
188
188
  "module": ".py.attrdocs",
189
189
  "attr": "_CLI_MODULE",
190
190
  "file": "omdev/py/attrdocs.py",
191
- "line": 160,
191
+ "line": 159,
192
192
  "value": {
193
193
  "!.cli.types.CliModule": {
194
194
  "name": "py/attrdocs",
omdev/__about__.py CHANGED
@@ -31,7 +31,7 @@ class Project(ProjectBase):
31
31
  ],
32
32
 
33
33
  'mypy': [
34
- 'mypy ~= 1.17',
34
+ 'mypy ~= 1.18',
35
35
  ],
36
36
 
37
37
  'prof': [
omdev/amalg/gen/srcfiles.py CHANGED
@@ -40,6 +40,17 @@ class SrcFile:
40
40
  has_binary_resources: bool = False
41
41
 
42
42
 
43
+ def drop_amalg_comment_lines(lines: ta.Iterable[tks.Tokens]) -> list[tks.Tokens]:
44
+ out: list[tks.Tokens] = []
45
+ for l in lines:
46
+ cl = list(tks.ignore_ws(l, drop_nl=True, keep=['COMMENT']))
47
+ if len(cl) == 1 and (t := cl[0]).name == 'COMMENT':
48
+ if t.src.split()[1:2] == ['@omlish-amalg']:
49
+ continue
50
+ out.append(l)
51
+ return out
52
+
53
+
43
54
  def make_src_file(
44
55
  path: str,
45
56
  *,
@@ -51,6 +62,8 @@ def make_src_file(
51
62
  tokens = tks.src_to_tokens(src)
52
63
  lines = tks.split_lines(tokens)
53
64
 
65
+ lines = drop_amalg_comment_lines(lines)
66
+
54
67
  header_lines, cls = split_header_lines(lines)
55
68
 
56
69
  header_lines = strip_header_lines(header_lines)
omdev/ci/github/api/v2/api.py CHANGED
@@ -90,6 +90,7 @@ class GithubCacheServiceV2:
90
90
  class CreateCacheEntryResponse:
91
91
  ok: bool
92
92
  signed_upload_url: str
93
+ message: ta.Optional[str] = None
93
94
 
94
95
  CREATE_CACHE_ENTRY_METHOD: Method[
95
96
  CreateCacheEntryRequest,
@@ -113,6 +114,7 @@ class GithubCacheServiceV2:
113
114
  class FinalizeCacheEntryUploadResponse:
114
115
  ok: bool
115
116
  entry_id: str
117
+ message: ta.Optional[str] = None
116
118
 
117
119
  FINALIZE_CACHE_ENTRY_METHOD: Method[
118
120
  FinalizeCacheEntryUploadRequest,
omdev/py/attrdocs.py CHANGED
@@ -24,12 +24,11 @@ class AttrDoc:
24
24
  trailing_comment: str | None = None
25
25
  preceding_comment: str | None = None
26
26
 
27
- __repr__ = lang.attr_ops(
28
- 'docstring',
29
- 'trailing_comment',
30
- 'preceding_comment',
31
- repr_filter=bool,
32
- ).repr
27
+ __repr__ = lang.attr_ops(lambda o: (
28
+ o.docstring,
29
+ o.trailing_comment,
30
+ o.preceding_comment,
31
+ ), repr_filter=bool).repr
33
32
 
34
33
 
35
34
  _EMPTY_ATTR_DOC = AttrDoc()
omdev/scripts/ci.py CHANGED
@@ -2547,6 +2547,7 @@ class GithubCacheServiceV2:
2547
2547
  class CreateCacheEntryResponse:
2548
2548
  ok: bool
2549
2549
  signed_upload_url: str
2550
+ message: ta.Optional[str] = None
2550
2551
 
2551
2552
  CREATE_CACHE_ENTRY_METHOD: Method[
2552
2553
  CreateCacheEntryRequest,
@@ -2570,6 +2571,7 @@ class GithubCacheServiceV2:
2570
2571
  class FinalizeCacheEntryUploadResponse:
2571
2572
  ok: bool
2572
2573
  entry_id: str
2574
+ message: ta.Optional[str] = None
2573
2575
 
2574
2576
  FINALIZE_CACHE_ENTRY_METHOD: Method[
2575
2577
  FinalizeCacheEntryUploadRequest,
omdev/scripts/lib/__init__.py ADDED
File without changes