omdev 0.0.0.dev352__tar.gz → 0.0.0.dev354__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev352
+Version: 0.0.0.dev354
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -10,9 +10,9 @@ 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: omlish==0.0.0.dev352
+Requires-Dist: omlish==0.0.0.dev354
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev352 → omdev-0.0.0.dev354}/omdev/.manifests.json

@@ -39,7 +39,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 176,
+    "line": 186,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cli",

{omdev-0.0.0.dev352 → omdev-0.0.0.dev354}/omdev/cli/clicli.py

@@ -1,5 +1,6 @@
 import inspect
 import os
+import re
 import shlex
 import subprocess
 import sys
@@ -23,6 +24,15 @@ from .types import CliModule
 DEFAULT_REINSTALL_URL = 'https://raw.githubusercontent.com/wrmsr/omlish/master/omdev/cli/install.py'
 
 
+_VALID_VERSION_STR = re.compile(r'\d+(\.\d+(\.\d+(\.dev\d+)?)?)?')
+
+
+def _parse_latest_version_str(s: str) -> str:
+    if not _VALID_VERSION_STR.fullmatch(s):
+        raise ValueError(f'Invalid version string: {s}')
+    return s
+
+
 class CliCli(ap.Cli):
 
     #
@@ -84,7 +94,7 @@ class CliCli(ap.Cli):
         ap.arg('extra_deps', nargs='*'),
     )
     def reinstall(self) -> None:
-        latest_version = lookup_latest_package_version(__package__.split('.')[0])
+        latest_version = _parse_latest_version_str(lookup_latest_package_version(__package__.split('.')[0]))
 
         #
 
@@ -153,7 +163,7 @@ class CliCli(ap.Cli):
             reco_cmd = ' '.join([
                 'curl -LsSf',
                 f"'{url}'" if (qu := shlex.quote(url)) == url else qu,
-                '| python3 -',
+                f'| python3 - --version {shlex.quote(latest_version)}',
                 *deps,
             ])
             print(f'Recovery command:\n\n{reco_cmd}\n')

{omdev-0.0.0.dev352 → omdev-0.0.0.dev354}/omdev/cli/install.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# ruff: noqa: UP045
 # @omlish-lite
 # @omlish-script
 """
@@ -19,17 +20,29 @@ import typing as ta
 
 
 DEFAULT_CLI_PKG = 'omdev-cli'
-DEFAULT_PY_VER = '3.12'
+DEFAULT_PY_VER = '3.13'
 
 
 @dc.dataclass(frozen=True)
 class InstallOpts:
     cli_pkg: str = DEFAULT_CLI_PKG
+    cli_ver: ta.Optional[str] = None
+
     py_ver: str = DEFAULT_PY_VER
 
     extras: ta.Sequence[str] = dc.field(default_factory=list)
 
 
+def _format_install_cli_pkg(opts: InstallOpts) -> str:
+    spec = opts.cli_pkg
+    if (ver := opts.cli_ver) is not None:
+        if any(c in ver for c in '=<>!~'):
+            spec += ver
+        else:
+            spec = f'{spec}=={ver}'
+    return spec
+
+
 class InstallManager(abc.ABC):
     @abc.abstractmethod
     def is_available(self) -> bool:
@@ -74,7 +87,7 @@ class UvxInstallManager(InstallManager):
             '--refresh',
             '--prerelease=allow',
             f'--python={opts.py_ver}',
-            opts.cli_pkg,
+            _format_install_cli_pkg(opts),
             *itertools.chain.from_iterable(['--with', e] for e in (opts.extras or [])),
         ])
 
@@ -113,7 +126,7 @@ class PipxInstallManager(InstallManager):
             'pipx',
             'install',
             f'--python={opts.py_ver}',
-            opts.cli_pkg,
+            _format_install_cli_pkg(opts),
             *itertools.chain.from_iterable(['--preinstall', e] for e in (opts.extras or [])),
         ])
 
@@ -140,8 +153,9 @@ def _main() -> None:
 
     parser = argparse.ArgumentParser()
     parser.add_argument('-c', '--cli', default=DEFAULT_CLI_PKG)
-    parser.add_argument('-p', '--py', default=DEFAULT_PY_VER)
-    parser.add_argument('-m', '--mgr')
+    parser.add_argument('-V', '--version')
+    parser.add_argument('-p', '--python', default=DEFAULT_PY_VER)
+    parser.add_argument('-m', '--manager')
     parser.add_argument('extra', nargs='*')
     args = parser.parse_args()
 
@@ -150,10 +164,10 @@ def _main() -> None:
 
     cli = cli.lower().replace('_', '-')
 
-    if not (py := args.py):
+    if not (py := args.python):
         raise ValueError(f'Must specify py')
 
-    if mgr := args.mgr:
+    if mgr := args.manager:
         if (im := INSTALL_MANAGERS.get(mgr)) is None:
             raise ValueError(f'Unsupported mgr: {mgr}')
         if not im.is_available():
@@ -171,6 +185,7 @@ def _main() -> None:
 
     im.install(InstallOpts(
         cli_pkg=cli,
+        cli_ver=args.version,
         py_ver=py,
         extras=args.extra,
     ))

{omdev-0.0.0.dev352 → omdev-0.0.0.dev354}/omdev/scripts/ci.py

@@ -9450,7 +9450,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
@@ -9463,7 +9467,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:
@@ -9487,7 +9491,9 @@ class CoroHttpServer:
 
                     o.close()
                     if o.close_connection:
-                        break
+                        return self.CoroHandleResult(
+                            close_reason='response',
+                        )
                     o = None
 
                 else:
@@ -9496,9 +9502,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'):
@@ -10813,16 +10821,32 @@ class CoroHttpServerSocketHandler(SocketHandler_):
             self,
             server_factory: CoroHttpServerFactory,
             *,
+            keep_alive: bool = False,
             log_handler: ta.Optional[ta.Callable[[CoroHttpServer, CoroHttpServer.AnyLogIo], None]] = None,
     ) -> None:
         super().__init__()
 
         self._server_factory = server_factory
+        self._keep_alive = keep_alive
         self._log_handler = log_handler
 
     def __call__(self, client_address: SocketAddress, fp: SocketIoPair) -> None:
         server = self._server_factory(client_address)
 
+        if self._keep_alive:
+            for i in itertools.count():  # noqa
+                res = self._handle_one(server, fp)
+                if res.close_reason is not None:
+                    break
+
+        else:
+            self._handle_one(server, fp)
+
+    def _handle_one(
+            self,
+            server: CoroHttpServer,
+            fp: SocketIoPair,
+    ) -> CoroHttpServer.CoroHandleResult:
         gen = server.coro_handle()
 
         o = next(gen)
@@ -10851,8 +10875,8 @@ class CoroHttpServerSocketHandler(SocketHandler_):
                     o = gen.send(i)
                 else:
                     o = next(gen)
-            except StopIteration:
-                break
+            except StopIteration as e:
+                return check.isinstance(e.value, CoroHttpServer.CoroHandleResult)
 
 
 ########################################
@@ -11666,6 +11690,7 @@ def make_simple_http_server(
         handler: HttpHandler,
         *,
         server_version: HttpProtocolVersion = HttpProtocolVersions.HTTP_1_1,
+        keep_alive: bool = False,
         ssl_context: ta.Optional['ssl.SSLContext'] = None,
         ignore_ssl_errors: bool = False,
         executor: ta.Optional[cf.Executor] = None,
@@ -11687,6 +11712,7 @@ def make_simple_http_server(
 
         socket_handler = CoroHttpServerSocketHandler(
             server_factory,
+            keep_alive=keep_alive,
         )
 
         #

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev352
+Version: 0.0.0.dev354
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -10,9 +10,9 @@ 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: omlish==0.0.0.dev352
+Requires-Dist: omlish==0.0.0.dev354
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

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

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

{omdev-0.0.0.dev352 → omdev-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,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev352',
+    'omlish == 0.0.0.dev354',
 ]
 
 [project.optional-dependencies]