omdev 0.0.0.dev12__tar.gz → 0.0.0.dev13__tar.gz

omdev-0.0.0.dev13/PKG-INFO

@@ -0,0 +1,32 @@
+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 → omdev-0.0.0.dev13}/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-0.0.0.dev12 → omdev-0.0.0.dev13}/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-0.0.0.dev12 → omdev-0.0.0.dev13}/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-0.0.0.dev12 → omdev-0.0.0.dev13}/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-0.0.0.dev12 → omdev-0.0.0.dev13}/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/omdev.egg-info/PKG-INFO

@@ -0,0 +1,32 @@
+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.dev13/omdev.egg-info/requires.txt

@@ -0,0 +1,23 @@
+omlish==0.0.0.dev13
+
+[all]
+pycparser~=2.22
+cffi~=1.17
+pcpp~=1.30
+mypy~=1.11
+tokenize_rt~=6.0
+wheel~=0.44
+
+[c]
+pycparser~=2.22
+cffi~=1.17
+pcpp~=1.30
+
+[mypy]
+mypy~=1.11
+
+[tokens]
+tokenize_rt~=6.0
+
+[wheel]
+wheel~=0.44

{omdev-0.0.0.dev12 → omdev-0.0.0.dev13}/pyproject.toml

@@ -11,8 +11,8 @@ authors = [
 ]
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
-requires-python = '>=3.12'
-version = '0.0.0.dev12'
+requires-python = '~=3.12'
+version = '0.0.0.dev13'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,31 +22,31 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev12',
+    'omlish == 0.0.0.dev13',
 ]
 
 [project.optional-dependencies]
 all = [
-    'pycparser >= 2.22',
-    'cffi >= 1.17',
-    'pcpp >= 1.30',
-    'mypy >= 1.11',
-    'tokenize_rt >= 6',
-    'wheel >= 0.44',
+    'pycparser ~= 2.22',
+    'cffi ~= 1.17',
+    'pcpp ~= 1.30',
+    'mypy ~= 1.11',
+    'tokenize_rt ~= 6.0',
+    'wheel ~= 0.44',
 ]
 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',
 ]
 
 [tool.setuptools]

omdev-0.0.0.dev12/PKG-INFO

@@ -1,32 +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"

omdev-0.0.0.dev12/omdev.egg-info/PKG-INFO

@@ -1,32 +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"

omdev-0.0.0.dev12/omdev.egg-info/requires.txt

@@ -1,23 +0,0 @@
-omlish==0.0.0.dev12
-
-[all]
-pycparser>=2.22
-cffi>=1.17
-pcpp>=1.30
-mypy>=1.11
-tokenize_rt>=6
-wheel>=0.44
-
-[c]
-pycparser>=2.22
-cffi>=1.17
-pcpp>=1.30
-
-[mypy]
-mypy>=1.11
-
-[tokens]
-tokenize_rt>=6
-
-[wheel]
-wheel>=0.44