omdev 0.0.0.dev534__tar.gz → 0.0.0.dev535__tar.gz

{omdev-0.0.0.dev534/omdev.egg-info → omdev-0.0.0.dev535}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev534
+Version: 0.0.0.dev535
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev534
+Requires-Dist: omlish==0.0.0.dev535
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev534 → omdev-0.0.0.dev535}/omdev/pyproject/pkg.py

@@ -166,6 +166,10 @@ class BasePyprojectPackageGenerator(Abstract):
                     continue
 
                 log.info('Found pkgdata %s', p)
+
+                if not os.path.isfile(os.path.join(p, '__init__.py')):
+                    raise RuntimeError(f'Cannot find __init__.py in {p}')
+
                 with open(os.path.join(p, f)) as fo:
                     src = fo.read()
 

{omdev-0.0.0.dev534 → omdev-0.0.0.dev535}/omdev/pyproject/tools/aboutdeps.py

@@ -45,7 +45,7 @@ def _main() -> None:
             if re.fullmatch(r'~=\s*\d+(\.\d+)*', str(opt_spec)):
                 opt_spec = Specifier(str(opt_spec) + '.0')
 
-            if opt_cn in pkgs:
+            if opt_cn in pkgs or opt_cn not in dist_dct:
                 continue
 
             opt_dist = dist_dct[opt_cn]

{omdev-0.0.0.dev534 → omdev-0.0.0.dev535}/omdev/scripts/lib/io/streams.py

@@ -30,12 +30,12 @@ def __omlish_amalg__():  # noqa
             dict(path='base.py', sha1='bdeaff419684dec34fd0dc59808a9686131992bc'),
             dict(path='framing.py', sha1='dc2d7f638b042619fd3d95789c71532a29fd5fe4'),
             dict(path='reading.py', sha1='7631635c46ab4b40bcaeb7c506cf15cb2d529a40'),
-            dict(path='utils.py', sha1='476363dfce81e3177a66f066892ed3fcf773ead8'),
+            dict(path='utils.py', sha1='b3b7ed67bff8b7f2b60d821eda9afa93ffb2ba1f'),
             dict(path='direct.py', sha1='83c33460e9490a77a00ae66251617ba98128b56b'),
             dict(path='scanning.py', sha1='6ab39887d0d2d3002201b786c4715e64804c66c8'),
-            dict(path='adapters.py', sha1='ce4fc01bd81bb6b3402dc71e46c37849a80e476d'),
-            dict(path='linear.py', sha1='b2d82224c6a3001eb8230d6a9c4de7cb3afe7d1c'),
-            dict(path='segmented.py', sha1='4aeb1c22b7b5994132f0b5906d70b3e53201776b'),
+            dict(path='adapters.py', sha1='f434206c6d8a0fd3961b1a44077ee69668e8bd0c'),
+            dict(path='linear.py', sha1='a6cebf552cc4d3277809eb0c63b99981e74d3731'),
+            dict(path='segmented.py', sha1='b48b53fd9a37902c382421658b50e3054f33abe4'),
             dict(path='_amalg.py', sha1='9c88a055447d7b37da1b356e6a1e00b7c4a9a3cb'),
         ],
     )
@@ -50,6 +50,9 @@ T = ta.TypeVar('T')
 # types.py
 BytesLikeOrMemoryview = ta.Union[bytes, bytearray, memoryview]  # ta.TypeAlias
 
+# utils.py
+CanByteStreamBuffer = ta.Union[BytesLikeOrMemoryview, 'ByteStreamBufferLike']  # ta.TypeAlias
+
 
 ########################################
 # ../errors.py
@@ -1643,7 +1646,7 @@ class BytesIoByteStreamBuffer(MutableByteStreamBuffer):
     def __init__(
             self,
             *,
-            compaction_threshold: int = 0x10000,
+            compaction_threshold: int = 64 * 1024,
     ) -> None:
         super().__init__()
 
@@ -1795,7 +1798,7 @@ class LinearByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffer):
             *,
             max_size: ta.Optional[int] = None,
             initial_capacity: int = 0,
-            compact_threshold: int = 0x10000,
+            compact_threshold: int = 64 * 1024,
     ) -> None:
         super().__init__()
 
@@ -1939,7 +1942,7 @@ class LinearByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffer):
             return _EMPTY_DIRECT_BYTE_STREAM_BUFFER_VIEW
 
         # Copy out the split prefix to keep the view stable even if the underlying buffer compacts.
-        b = bytes(memoryview(self._ba)[self._rpos:self._rpos + n])
+        b = ByteStreamBuffers.memoryview_to_bytes(memoryview(self._ba)[self._rpos:self._rpos + n])
         self._rpos += n
 
         # If we consumed everything, reset best-effort; otherwise allow compaction policy to handle later.
@@ -2075,7 +2078,15 @@ class SegmentedByteStreamBufferView(BaseByteStreamBufferLike, ByteStreamBufferVi
 
         self._segs = tuple(segs)
         for mv in self._segs:
-            self._len += len(mv)
+            if (mvl := len(mv)) < 1:
+                raise ValueError('Empty segment')
+            self._len += mvl
+
+    @classmethod
+    def of_opt(cls, segs: ta.Sequence[memoryview]) -> ta.Optional['SegmentedByteStreamBufferView']:
+        if not segs:
+            return None
+        return cls(segs)
 
     _len = 0
 
@@ -2094,8 +2105,8 @@ class SegmentedByteStreamBufferView(BaseByteStreamBufferLike, ByteStreamBufferVi
         if not self._segs:
             return b''
         if len(self._segs) == 1:
-            return bytes(self._segs[0])
-        return b''.join(bytes(mv) for mv in self._segs)
+            return ByteStreamBuffers.memoryview_to_bytes(self._segs[0])
+        return b''.join(ByteStreamBuffers.memoryview_to_bytes(mv) for mv in self._segs)
 
 
 class SegmentedByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffer):
@@ -2260,7 +2271,7 @@ class SegmentedByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffe
         if self._chunk_size and (float(used) / float(self._chunk_size)) < self._chunk_compact_threshold:
             if not self._segs or self._segs[-1] is not a:
                 raise RuntimeError('active not at tail')
-            self._segs[-1] = bytes(memoryview(a)[:used])
+            self._segs[-1] = ByteStreamBuffers.memoryview_to_bytes(memoryview(a)[:used])
 
         else:
             # Try to shrink in-place to used bytes. If exported views exist, this can BufferError; fall back to bytes()
@@ -2270,7 +2281,7 @@ class SegmentedByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffe
             try:
                 del a[used:]  # may raise BufferError if any exports exist
             except BufferError:
-                self._segs[-1] = bytes(memoryview(a)[:used])
+                self._segs[-1] = ByteStreamBuffers.memoryview_to_bytes(memoryview(a)[:used])
 
         self._active = None
         self._active_used = 0
@@ -2386,7 +2397,7 @@ class SegmentedByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffe
             self._segs.append(b)
             self._len += n
         else:
-            bb = bytes(memoryview(b)[:n])
+            bb = ByteStreamBuffers.memoryview_to_bytes(memoryview(b)[:n])
             self._segs.append(bb)
             self._len += n
 

{omdev-0.0.0.dev534 → omdev-0.0.0.dev535}/omdev/scripts/pyproject.py

@@ -148,7 +148,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../interp/providers/system.py', sha1='9638a154475ca98775159d27739563ac7fb2eb16'),
             dict(path='../interp/pyenv/install.py', sha1='4a10a19717364b4ba9f3b8bf1d12621cf21ba8b8'),
             dict(path='../interp/uv/provider.py', sha1='3c3980878ad2b9fd2cd02172f9424954759c7f06'),
-            dict(path='pkg.py', sha1='b2b63a3906d62e5911d2e5c0ee178041c53eff50'),
+            dict(path='pkg.py', sha1='2f0b5dc8cb359ee4d499f5a52a62b790b5557a3b'),
             dict(path='../interp/providers/inject.py', sha1='7cc9ebf58cf2ec09545321456bd9da9f9a3a79fb'),
             dict(path='../interp/pyenv/provider.py', sha1='377542ce01a35849e2a5b4a4dbafedc26882f983'),
             dict(path='../interp/uv/inject.py', sha1='e95d058c2340baa5a3155ec3440f311d1daa10a8'),
@@ -11799,6 +11799,10 @@ class BasePyprojectPackageGenerator(Abstract):
                     continue
 
                 log.info('Found pkgdata %s', p)
+
+                if not os.path.isfile(os.path.join(p, '__init__.py')):
+                    raise RuntimeError(f'Cannot find __init__.py in {p}')
+
                 with open(os.path.join(p, f)) as fo:
                     src = fo.read()
 

{omdev-0.0.0.dev534 → omdev-0.0.0.dev535/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev534
+Version: 0.0.0.dev535
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev534
+Requires-Dist: omlish==0.0.0.dev535
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev534 → omdev-0.0.0.dev535}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev534
+omlish==0.0.0.dev535
 
 [all]
 black~=26.1

{omdev-0.0.0.dev534 → omdev-0.0.0.dev535}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev534'
+version = '0.0.0.dev535'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev534',
+    'omlish == 0.0.0.dev535',
 ]
 
 [project.optional-dependencies]