omdev 0.0.0.dev364__tar.gz → 0.0.0.dev366__tar.gz

{omdev-0.0.0.dev364/omdev.egg-info → omdev-0.0.0.dev366}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev364
+Version: 0.0.0.dev366
 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.dev366
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev364 → omdev-0.0.0.dev366}/omdev/.manifests.json

@@ -150,7 +150,7 @@
     "module": ".py.attrdocs",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/attrdocs.py",
-    "line": 155,
+    "line": 160,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/attrdocs",

{omdev-0.0.0.dev364 → omdev-0.0.0.dev366}/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-0.0.0.dev364 → omdev-0.0.0.dev366}/omdev/py/attrdocs.py

@@ -1,4 +1,9 @@
 # ruff: noqa: N802
+"""
+TODO:
+ - shared / global ast cache
+  - weak key by module?
+"""
 import ast
 import dataclasses as dc
 import inspect

{omdev-0.0.0.dev364 → omdev-0.0.0.dev366}/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-0.0.0.dev364 → omdev-0.0.0.dev366}/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 → omdev-0.0.0.dev366/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev364
+Version: 0.0.0.dev366
 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.dev366
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev364 → omdev-0.0.0.dev366}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev364
+omlish==0.0.0.dev366
 
 [all]
 black~=25.1

{omdev-0.0.0.dev364 → omdev-0.0.0.dev366}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.13'
-version = '0.0.0.dev364'
+version = '0.0.0.dev366'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev364',
+    'omlish == 0.0.0.dev366',
 ]
 
 [project.optional-dependencies]