omdev 0.0.0.dev364__py3-none-any.whl → 0.0.0.dev365__py3-none-any.whl

omdev/cc/cli.py

@@ -17,8 +17,11 @@ Freestanding options:
 
 TODO:
  - cext interop
- - gen cmake
+ - cc cmake
+  - shlex shebang to extract opts
   - nanobind
+  - 2 dep mechanisms? not necessarily bad
+ - cc ij, based off of cmake
  - fix CFLAGS/CCFLAGS/CPPFLAGS/CXXFLAGS
  - jit-gen cmake mode? multi-src builds
 """

omdev/py/docstrings/google.py

@@ -44,7 +44,7 @@ class Section(ta.NamedTuple):
     type: SectionType
 
 
-_GOOGLE_TYPED_ARG_PAT = re.compile(r'\s*(.+?)\s*\(\s*(.*[^\s]+)\s*\)')
+_GOOGLE_TYPED_ARG_PAT = re.compile(r'\s*(.+?)\s*\(\s*(.*\S+)\s*\)')
 _GOOGLE_ARG_DESC_PAT = re.compile(r'.*\. Defaults to (.+)\.')
 _MULTIPLE_PATTERN = re.compile(r'(\s*[^:\s]+:)|([^:]*\]:.*)')
 
@@ -70,7 +70,9 @@ class GoogleParser:
     def __init__(
             self,
             sections: list[Section] | None = None,
+            *,
             title_colon: bool = True,
+            meta_separators: ta.Sequence[str] = ':-',
     ) -> None:
         """
         Setup sections.
@@ -85,6 +87,7 @@ class GoogleParser:
             sections = DEFAULT_SECTIONS
         self.sections = {s.title: s for s in sections}
         self.title_colon = title_colon
+        self.meta_separators = meta_separators
         self._setup()
 
     def _setup(self) -> None:
@@ -94,11 +97,11 @@ class GoogleParser:
             colon = ''
 
         self.titles_re = re.compile(
-            '^('
-            + '|'.join(f'({t})' for t in self.sections)
-            + ')'
-            + colon
-            + '[ \t\r\f\v]*$',
+            '^(' +
+            '|'.join(f'({t})' for t in self.sections) +
+            ')' +
+            colon +
+            '[ \t\r\f\v]*$',
             flags=re.MULTILINE,
         )
 
@@ -122,19 +125,23 @@ class GoogleParser:
         ):
             return self._build_single_meta(section, text)
 
-        if ':' not in text:
-            raise ParseError(f'Expected a colon in {text!r}.')
+        seps = self.meta_separators
+        for sep in seps:
+            if sep not in text:
+                continue
+
+            # Split spec and description
+            before, desc = text.split(sep, 1)
+            if desc:
+                desc = desc[1:] if desc[0] == ' ' else desc
+                if '\n' in desc:
+                    first_line, rest = desc.split('\n', 1)
+                    desc = first_line + '\n' + inspect.cleandoc(rest)
+                desc = desc.strip('\n')
 
-        # Split spec and description
-        before, desc = text.split(':', 1)
-        if desc:
-            desc = desc[1:] if desc[0] == ' ' else desc
-            if '\n' in desc:
-                first_line, rest = desc.split('\n', 1)
-                desc = first_line + '\n' + inspect.cleandoc(rest)
-            desc = desc.strip('\n')
+            return self._build_multi_meta(section, before, desc)
 
-        return self._build_multi_meta(section, before, desc)
+        raise ParseError(f'Expected some separator {seps!r} in {text!r}.')
 
     @staticmethod
     def _build_single_meta(section: Section, desc: str) -> DocstringMeta:
@@ -161,7 +168,7 @@ class GoogleParser:
             )
 
         if section.key in PARAM_KEYWORDS:
-            raise ParseError('Expected paramenter name.')
+            raise ParseError('Expected parameter name.')
 
         return DocstringMeta(args=[section.key], description=desc)
 

omdev/scripts/ci.py

@@ -1975,6 +1975,31 @@ def unlinking_if_exists(path: str) -> ta.Iterator[None]:
 ##
 
 
+@ta.overload
+def path_dirname(p: str, n: int = 1) -> str:
+    ...
+
+
+@ta.overload
+def path_dirname(p: bytes, n: int = 1) -> bytes:
+    ...
+
+
+def path_dirname(p, n=1):
+    if isinstance(p, bytes):
+        sep: ta.Any = b'/'
+    else:
+        sep = '/'
+    p = os.fspath(p)
+    i = -1
+    for _ in range(n):
+        i = p.rindex(sep, 0, i)
+    head = p[:i + 1]
+    if head and head != sep * len(head):
+        head = head.rstrip(sep)
+    return head
+
+
 def abs_real_path(p: str) -> str:
     return os.path.abspath(os.path.realpath(p))
 

{omdev-0.0.0.dev364.dist-info → omdev-0.0.0.dev365.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev364
+Version: 0.0.0.dev365
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev364
+Requires-Dist: omlish==0.0.0.dev365
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev364.dist-info → omdev-0.0.0.dev365.dist-info}/RECORD

@@ -36,7 +36,7 @@ omdev/cc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cc/__main__.py,sha256=n7gxSRYZ1QZOUxQPCT0_n9Xl26zi2UIvCwyGW_m67nA,166
 omdev/cc/cdeps.py,sha256=Uou-V1qcwWhe14iTu39W7yxOlDdr_P96Ai8wQjAp3zQ,1535
 omdev/cc/cdeps.toml,sha256=MqZ1OQHQ2JPvQpHRL32GpRgQWQRtzjPI2EWl4EqSm-I,1004
-omdev/cc/cli.py,sha256=qmBLyq7dz85Sv4xZ_YR2S4UehCGKrf7-ZIWL0RwnLIY,4918
+omdev/cc/cli.py,sha256=B-_FIEjox1O9vhlvgVVO4X6Qo4acWIm-eW5kAwSwFUc,5022
 omdev/cc/srclangs.py,sha256=3u_APHgknuc-BPRQSDISwSzouluKsnLlBxodp-XCl_E,728
 omdev/cexts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cexts/_boilerplate.cc,sha256=sbpXEgdFrkdzZXgaNWFFNN27fL9TZu6VrwvMY4-nnFM,1726
@@ -228,7 +228,7 @@ omdev/py/docstrings/__init__.py,sha256=HFzqco1oj6M7KQ80i48W9gYABVJU8oM_1wpl9ndBN
 omdev/py/docstrings/attrdoc.py,sha256=xo-AFqEPfz1XppsCMJS80pG1Vdd2TiBsoxZ7YP6ZHC4,4269
 omdev/py/docstrings/common.py,sha256=7YUu5-RxhbCEKHMvfUNxXhTd9lcGTC8CGAmWeXZTta4,6378
 omdev/py/docstrings/epydoc.py,sha256=Z6Dg6ImKOY3hP-mZoiwU3nGOReap5vt_T_3LIGnpess,6177
-omdev/py/docstrings/google.py,sha256=D0KHXPRsf3HFKZmMXdBnfkVGclnjQX7ae9wMqsMVeqs,10301
+omdev/py/docstrings/google.py,sha256=zWrhzQ_QGOtH6s9SfmZGCduKv3JJVe6rJlDe-kAdUW8,10552
 omdev/py/docstrings/numpydoc.py,sha256=SLyIoPR5U5HtXJ18yeQf4HlYHtcro3THh9CqeWDDDH4,12266
 omdev/py/docstrings/parser.py,sha256=umJEgQBkSXLwWIKZrBbFCfNrz847vpTNDqTTEwlvHpA,2324
 omdev/py/docstrings/rest.py,sha256=c2xPYg_W01W9eYY_KLKX69E4qu4jpkgUshi5K5EyVv8,5221
@@ -252,7 +252,7 @@ omdev/pyproject/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQo04dR1czcc,838
 omdev/pyproject/resources/python.sh,sha256=rFaN4SiJ9hdLDXXsDTwugI6zsw6EPkgYMmtacZeTbvw,749
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
-omdev/scripts/ci.py,sha256=9yDySeJ4tU63Zf8jSL2QdM1jkCEQ3T8VCTc3pHOTUFo,357984
+omdev/scripts/ci.py,sha256=eaxyndzJcHoXh1jbsP67QbtMgVzOgr2RvN0ysAoAOyI,358433
 omdev/scripts/interp.py,sha256=T8EdNxuncwqCXfIBfCLoUcsYNqEhOrOE8V1hC9vTzqI,158095
 omdev/scripts/pyproject.py,sha256=qBBXmbdKMYzqxnb0zEWYhCOg9Cy0pWno3wjulICFj_o,267626
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
@@ -303,9 +303,9 @@ omdev/tools/jsonview/resources/jsonview.js,sha256=faDvXDOXKvEvjOuIlz4D3F2ReQXb_b
 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=ao5mdrpiSU4AZ8mBozoEaV3UVlmVTnRG9wD9XP70MZE,11429
-omdev-0.0.0.dev364.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev364.dist-info/METADATA,sha256=3g4HotiW-zDtGxF8cJ5YxL_6gfz2hZHGmsZEh5mSppk,1674
-omdev-0.0.0.dev364.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev364.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev364.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev364.dist-info/RECORD,,
+omdev-0.0.0.dev365.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev365.dist-info/METADATA,sha256=kQICG8LA3JGKzBdHFee2vJVQP5hh1R-racMDhIO7CQU,1674
+omdev-0.0.0.dev365.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev365.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev365.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev365.dist-info/RECORD,,