ominfra 0.0.0.dev352__tar.gz → 0.0.0.dev354__tar.gz

{ominfra-0.0.0.dev352/ominfra.egg-info → ominfra-0.0.0.dev354}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev352
+Version: 0.0.0.dev354
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -10,10 +10,10 @@ Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
-Requires-Python: >=3.12
+Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev352
-Requires-Dist: omlish==0.0.0.dev352
+Requires-Dist: omdev==0.0.0.dev354
+Requires-Dist: omlish==0.0.0.dev354
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev352 → ominfra-0.0.0.dev354}/ominfra/clouds/aws/models/services/ec2.py

@@ -1565,6 +1565,7 @@ class ResourceType(_enum.Enum):
     INSTANCE_CONNECT_ENDPOINT = 'instance-connect-endpoint'
     VERIFIED_ACCESS_ENDPOINT_TARGET = 'verified-access-endpoint-target'
     IPAM_EXTERNAL_RESOURCE_VERIFICATION_TOKEN = 'ipam-external-resource-verification-token'
+    CAPACITY_BLOCK = 'capacity-block'
     MAC_MODIFICATION_TASK = 'mac-modification-task'
 
 
@@ -7691,6 +7692,12 @@ class Instance(
         shape_name='CpuOptions',
     ))
 
+    capacity_block_id: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='CapacityBlockId',
+        serialization_name='capacityBlockId',
+        shape_name='String',
+    ))
+
     capacity_reservation_id: str | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='CapacityReservationId',
         serialization_name='capacityReservationId',

{ominfra-0.0.0.dev352 → ominfra-0.0.0.dev354}/ominfra/manage/main.py

@@ -1,7 +1,7 @@
 # @omlish-amalg ../scripts/manage.py
 # ruff: noqa: UP006 UP007 UP045
 """
-manage.py -s 'docker run -i python:3.12'
+manage.py -s 'docker run -i python:3.13'
 manage.py -s 'ssh -i /foo/bar.pem foo@bar.baz' -q --python=python3.8
 """
 import asyncio

{ominfra-0.0.0.dev352 → ominfra-0.0.0.dev354}/ominfra/scripts/manage.py

@@ -7,7 +7,7 @@
 # @omlish-git-diff-omit
 # ruff: noqa: N802 TC003 UP006 UP007 UP036 UP045
 """
-manage.py -s 'docker run -i python:3.12'
+manage.py -s 'docker run -i python:3.13'
 manage.py -s 'ssh -i /foo/bar.pem foo@bar.baz' -q --python=python3.8
 """
 import abc
@@ -3870,7 +3870,7 @@ ID=ubuntu
 ID_LIKE=debian
 UBUNTU_CODENAME=jammy
 
-➜  omlish git:(master) docker run -i python:3.12 cat /etc/os-release
+➜  omlish git:(master) docker run -i python:3.13 cat /etc/os-release
 PRETTY_NAME="Debian GNU/Linux 12 (bookworm)"
 NAME="Debian GNU/Linux"
 VERSION_ID="12"

{ominfra-0.0.0.dev352 → ominfra-0.0.0.dev354}/ominfra/scripts/supervisor.py

@@ -7996,7 +7996,11 @@ class CoroHttpServer:
 
     #
 
-    def coro_handle(self) -> ta.Generator[Io, ta.Optional[bytes], None]:
+    @dc.dataclass(frozen=True)
+    class CoroHandleResult:
+        close_reason: ta.Literal['response', 'internal', None] = None
+
+    def coro_handle(self) -> ta.Generator[Io, ta.Optional[bytes], CoroHandleResult]:
         return self._coro_run_handler(self._coro_handle_one())
 
     class Close(Exception):  # noqa
@@ -8009,7 +8013,7 @@ class CoroHttpServer:
                 ta.Optional[bytes],
                 None,
             ],
-    ) -> ta.Generator[Io, ta.Optional[bytes], None]:
+    ) -> ta.Generator[Io, ta.Optional[bytes], CoroHandleResult]:
         i: ta.Optional[bytes]
         o: ta.Any = next(gen)
         while True:
@@ -8033,7 +8037,9 @@ class CoroHttpServer:
 
                     o.close()
                     if o.close_connection:
-                        break
+                        return self.CoroHandleResult(
+                            close_reason='response',
+                        )
                     o = None
 
                 else:
@@ -8042,9 +8048,11 @@ class CoroHttpServer:
                 try:
                     o = gen.send(i)
                 except self.Close:
-                    return
+                    return self.CoroHandleResult(
+                        close_reason='internal',
+                    )
                 except StopIteration:
-                    break
+                    return self.CoroHandleResult()
 
             except Exception:  # noqa
                 if hasattr(o, 'close'):
@@ -8893,7 +8901,13 @@ class CoroHttpServerConnectionFdioHandler(SocketFdioHandler):
             addr,
             handler=self._handler,
         )
-        self._srv_coro: ta.Optional[ta.Generator[CoroHttpServer.Io, ta.Optional[bytes], None]] = self._coro_srv.coro_handle()  # noqa
+        self._srv_coro: ta.Optional[
+            ta.Generator[
+                CoroHttpServer.Io,
+                ta.Optional[bytes],
+                CoroHttpServer.CoroHandleResult,
+            ],
+        ] = self._coro_srv.coro_handle()
 
         self._cur_io: ta.Optional[CoroHttpServer.Io] = None
         self._next_io()

{ominfra-0.0.0.dev352 → ominfra-0.0.0.dev354/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev352
+Version: 0.0.0.dev354
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -10,10 +10,10 @@ Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
-Requires-Python: >=3.12
+Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev352
-Requires-Dist: omlish==0.0.0.dev352
+Requires-Dist: omdev==0.0.0.dev354
+Requires-Dist: omlish==0.0.0.dev354
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev352 → ominfra-0.0.0.dev354}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev352
-omlish==0.0.0.dev352
+omdev==0.0.0.dev354
+omlish==0.0.0.dev354
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev352 → ominfra-0.0.0.dev354}/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.dev352'
+requires-python = '>=3.13'
+version = '0.0.0.dev354'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev352',
-    'omlish == 0.0.0.dev352',
+    'omdev == 0.0.0.dev354',
+    'omlish == 0.0.0.dev354',
 ]
 
 [project.optional-dependencies]