omdev 0.0.0.dev12__py3-none-any.whl → 0.0.0.dev13__py3-none-any.whl

omdev/__about__.py

@@ -13,21 +13,21 @@ class Project(ProjectBase):
 
     optional_dependencies = {
         'c': [
-            'pycparser >= 2.22',
-            'cffi >= 1.17',
-            'pcpp >= 1.30',
+            'pycparser ~= 2.22',
+            'cffi ~= 1.17',
+            'pcpp ~= 1.30',
         ],
 
         'mypy': [
-            'mypy >= 1.11',
+            'mypy ~= 1.11',
         ],
 
         'tokens': [
-            'tokenize_rt >= 6',
+            'tokenize_rt ~= 6.0',
         ],
 
         'wheel': [
-            'wheel >= 0.44',
+            'wheel ~= 0.44',
         ],
     }
 

omdev/amalg/amalg.py

@@ -363,13 +363,25 @@ def gen_amalg(
 
     ##
 
+    tyd: dict[str, list[Typing]] = {}
     tys = set()
     for sf in sfs:
         f = src_files[sf]
         for ty in f.typings:
             if ty.src not in tys:
-                out.write(ty.src)
+                tyd.setdefault(f.path, []).append(ty)
                 tys.add(ty.src)
+    for i, (sf, ftys) in enumerate(tyd.items()):
+        f = src_files[sf]
+        if i:
+            out.write('\n')
+        if f is not mf:
+            rp = os.path.relpath(f.path, mf.path)
+        else:
+            rp = os.path.basename(f.path)
+        out.write(f'# {rp}\n')
+        for ty in ftys:
+            out.write(ty.src)
     if tys:
         out.write('\n\n')
 

omdev/exts/cmake.py

@@ -77,7 +77,7 @@ class CmakeProjectGen:
 
     @lang.cached_function
     def prj_name(self) -> str:
-        return os.path.basename(os.path.dirname(self.prj_root))
+        return os.path.basename(self.prj_root)
 
     @lang.cached_function
     def cmake_dir(self) -> str:

omdev/scripts/interp.py

@@ -29,13 +29,18 @@ import threading
 import typing as ta
 
 
+# ../../versioning/versions.py
 VersionLocalType = ta.Tuple[ta.Union[int, str], ...]
 VersionCmpPrePostDevType = ta.Union['InfinityVersionType', 'NegativeInfinityVersionType', ta.Tuple[str, int]]
 _VersionCmpLocalType0 = ta.Tuple[ta.Union[ta.Tuple[int, str], ta.Tuple['NegativeInfinityVersionType', ta.Union[int, str]]], ...]  # noqa
 VersionCmpLocalType = ta.Union['NegativeInfinityVersionType', _VersionCmpLocalType0]
 VersionCmpKey = ta.Tuple[int, ta.Tuple[int, ...], VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpLocalType]  # noqa
 VersionComparisonMethod = ta.Callable[[VersionCmpKey, VersionCmpKey], bool]
+
+# ../../../omlish/lite/check.py
 T = ta.TypeVar('T')
+
+# ../../versioning/specifiers.py
 UnparsedVersion = ta.Union['Version', str]
 UnparsedVersionVar = ta.TypeVar('UnparsedVersionVar', bound=UnparsedVersion)
 CallableVersionOperator = ta.Callable[['Version', str], bool]

omdev/scripts/pyproject.py

@@ -55,16 +55,23 @@ import uuid
 import weakref  # noqa
 
 
+# ../../toml/parser.py
 TomlParseFloat = ta.Callable[[str], ta.Any]
 TomlKey = ta.Tuple[str, ...]
 TomlPos = int  # ta.TypeAlias
+
+# ../../versioning/versions.py
 VersionLocalType = ta.Tuple[ta.Union[int, str], ...]
 VersionCmpPrePostDevType = ta.Union['InfinityVersionType', 'NegativeInfinityVersionType', ta.Tuple[str, int]]
 _VersionCmpLocalType0 = ta.Tuple[ta.Union[ta.Tuple[int, str], ta.Tuple['NegativeInfinityVersionType', ta.Union[int, str]]], ...]  # noqa
 VersionCmpLocalType = ta.Union['NegativeInfinityVersionType', _VersionCmpLocalType0]
 VersionCmpKey = ta.Tuple[int, ta.Tuple[int, ...], VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpLocalType]  # noqa
 VersionComparisonMethod = ta.Callable[[VersionCmpKey, VersionCmpKey], bool]
+
+# ../../../omlish/lite/check.py
 T = ta.TypeVar('T')
+
+# ../../versioning/specifiers.py
 UnparsedVersion = ta.Union['Version', str]
 UnparsedVersionVar = ta.TypeVar('UnparsedVersionVar', bound=UnparsedVersion)
 CallableVersionOperator = ta.Callable[['Version', str], bool]

omdev-0.0.0.dev13.dist-info/METADATA

@@ -0,0 +1,33 @@
+Metadata-Version: 2.1
+Name: omdev
+Version: 0.0.0.dev13
+Summary: omdev
+Author: wrmsr
+License: BSD-3-Clause
+Project-URL: source, https://github.com/wrmsr/omlish
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Operating System :: POSIX
+Requires-Python: ~=3.12
+License-File: LICENSE
+Requires-Dist: omlish ==0.0.0.dev13
+Provides-Extra: all
+Requires-Dist: pycparser ~=2.22 ; extra == 'all'
+Requires-Dist: cffi ~=1.17 ; extra == 'all'
+Requires-Dist: pcpp ~=1.30 ; extra == 'all'
+Requires-Dist: mypy ~=1.11 ; extra == 'all'
+Requires-Dist: tokenize-rt ~=6.0 ; extra == 'all'
+Requires-Dist: wheel ~=0.44 ; extra == 'all'
+Provides-Extra: c
+Requires-Dist: pycparser ~=2.22 ; extra == 'c'
+Requires-Dist: cffi ~=1.17 ; extra == 'c'
+Requires-Dist: pcpp ~=1.30 ; extra == 'c'
+Provides-Extra: mypy
+Requires-Dist: mypy ~=1.11 ; extra == 'mypy'
+Provides-Extra: tokens
+Requires-Dist: tokenize-rt ~=6.0 ; extra == 'tokens'
+Provides-Extra: wheel
+Requires-Dist: wheel ~=0.44 ; extra == 'wheel'
+

{omdev-0.0.0.dev12.dist-info → omdev-0.0.0.dev13.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/__about__.py,sha256=1_K0XcxD8vsox-WAaNP2PfuyjnKQaEP6Nr7XdQptKiQ,782
+omdev/__about__.py,sha256=VuY8DTDYJifMW_xeF21JIhFM-MwVp1F0vWUhzIqomJA,784
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/classdot.py,sha256=urN5Pzd2ooAwnfkH0z-muQxdO90IMo-sX2WB-A37lVU,1533
 omdev/cmake.py,sha256=Diy2ry65806dQP125DAstD3w46z_wszMH7PwC2-6iik,4578
@@ -6,10 +6,10 @@ omdev/tokens.py,sha256=GusxQ1Cd_eiScuR8XTTtc9QFhOgYviYGBZmFnn3Hj7s,756
 omdev/wheelfile.py,sha256=yfupGcGkbFlmzGzKU64k_vmOKpaKnUlDWxeGn2KdekU,10005
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/amalg/__main__.py,sha256=OE1udULO1g4McUbeg1CoHbSm4hbQ2kcE3ffEGxlnPh4,69
-omdev/amalg/amalg.py,sha256=2k9oHxP5HDKopfWspABq2ZVjVsZpUZoejUnHeL7cE9M,11477
+omdev/amalg/amalg.py,sha256=q1YysHehhJtHuf9znZ2cpPT5nFz1WQLXWVcIv99BVyI,11867
 omdev/exts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/exts/build.py,sha256=zViF1wYx6z5ACyifgNjlCAVoPAMCKpTr_VoAvwtmvtY,1013
-omdev/exts/cmake.py,sha256=kEIPa7x1MPPzJ1F067I9nD2NMEHIldijJ9dnnoUV6Oc,9601
+omdev/exts/cmake.py,sha256=D1RCmOAowxunEq8HAlIL_8514SBniDPlfynVdAzHS3c,9584
 omdev/exts/importhook.py,sha256=HgEM6UD52BoQi4dhSSk8buoqV6YRUvzQOOWzX6W1aic,2306
 omdev/exts/scan.py,sha256=ivk_Zh_AnOu8jHeaFZnITwMSwaQqOcHxwOjzsAyL1Gc,1640
 omdev/exts/_distutils/__init__.py,sha256=c1zImtnPh3uY8BUTV4RLKtGKqTPx3c_pBbhA6tPtNsE,297
@@ -50,8 +50,8 @@ omdev/scripts/bracepy.py,sha256=CUg3nNKE8n34a5j77SUli8ivsOj5ks6I_5VIF8bl-zY,2562
 omdev/scripts/execrss.py,sha256=wBpdhWuQj_4EnEmvK_aLQHxaE-J52G9F6g0210fTNe8,307
 omdev/scripts/findimports.py,sha256=d8Xf2TcE7hHh_lXUx2V1APF4Jggu2uO2K0ex6bfmqyQ,2030
 omdev/scripts/findmagic.py,sha256=z_D9zzZJBuWPbR20NEh8i8NJBnCYWlttg2GTJpmDM4s,1994
-omdev/scripts/interp.py,sha256=z66pI9s1yVOD-HMCDdHzq6gRfezoex5MjQ7jnJIAIuU,62939
-omdev/scripts/pyproject.py,sha256=df2a4oKTWMohgSgiEKLshdABhkIapKH3arlbdJ71XeM,119248
+omdev/scripts/interp.py,sha256=itY5pq1ahDjw8mYZcHec5qQRbAZezliPUyyZ1VD7zTg,63037
+omdev/scripts/pyproject.py,sha256=NuWW0nu897jaydR-1f-Gz7pxl-zzTOjNwKiCK3uzjDY,119370
 omdev/scripts/traceimport.py,sha256=JmUgLEQLY7r3QNQ14Agarqh5qtMyRNenCb_OF5EIikY,13392
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/toml/parser.py,sha256=84bn09uhYHwQGyfww6Rw6y1RxPAE_HDltODOSakcqDM,29186
@@ -64,8 +64,8 @@ omdev/tools/sqlrepl.py,sha256=v9uVQ4nvquSXcQVYIFq34ikumSILvKqzD6lUKLcncCE,5646
 omdev/versioning/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/versioning/specifiers.py,sha256=6Odf9e6farwlPRsD_YqwTfYKG-BXn_dIcKtqfkhfodI,17432
 omdev/versioning/versions.py,sha256=ei2eopEsJq3zSMJmezK1nzZgikgCdxFtnF3f69nCRZQ,12246
-omdev-0.0.0.dev12.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev12.dist-info/METADATA,sha256=jfw5V9x0tGvZVbsdhqEPawZJDt3GSj6j0o6XSc8VtUc,1122
-omdev-0.0.0.dev12.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-omdev-0.0.0.dev12.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev12.dist-info/RECORD,,
+omdev-0.0.0.dev13.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev13.dist-info/METADATA,sha256=EWbybLAXeBMkrn_XTfZlFQYsGO837utkj7Qgs1rXGXo,1126
+omdev-0.0.0.dev13.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
+omdev-0.0.0.dev13.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev13.dist-info/RECORD,,

{omdev-0.0.0.dev12.dist-info → omdev-0.0.0.dev13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.0.0)
+Generator: setuptools (74.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

omdev-0.0.0.dev12.dist-info/METADATA

@@ -1,33 +0,0 @@
-Metadata-Version: 2.1
-Name: omdev
-Version: 0.0.0.dev12
-Summary: omdev
-Author: wrmsr
-License: BSD-3-Clause
-Project-URL: source, https://github.com/wrmsr/omlish
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Development Status :: 2 - Pre-Alpha
-Classifier: Intended Audience :: Developers
-Classifier: Operating System :: OS Independent
-Classifier: Operating System :: POSIX
-Requires-Python: >=3.12
-License-File: LICENSE
-Requires-Dist: omlish ==0.0.0.dev12
-Provides-Extra: all
-Requires-Dist: pycparser >=2.22 ; extra == 'all'
-Requires-Dist: cffi >=1.17 ; extra == 'all'
-Requires-Dist: pcpp >=1.30 ; extra == 'all'
-Requires-Dist: mypy >=1.11 ; extra == 'all'
-Requires-Dist: tokenize-rt >=6 ; extra == 'all'
-Requires-Dist: wheel >=0.44 ; extra == 'all'
-Provides-Extra: c
-Requires-Dist: pycparser >=2.22 ; extra == 'c'
-Requires-Dist: cffi >=1.17 ; extra == 'c'
-Requires-Dist: pcpp >=1.30 ; extra == 'c'
-Provides-Extra: mypy
-Requires-Dist: mypy >=1.11 ; extra == 'mypy'
-Provides-Extra: tokens
-Requires-Dist: tokenize-rt >=6 ; extra == 'tokens'
-Provides-Extra: wheel
-Requires-Dist: wheel >=0.44 ; extra == 'wheel'
-