ominfra 0.0.0.dev281__tar.gz → 0.0.0.dev283__tar.gz

{ominfra-0.0.0.dev281/ominfra.egg-info → ominfra-0.0.0.dev283}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev281
+Version: 0.0.0.dev283
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev281
-Requires-Dist: omlish==0.0.0.dev281
+Requires-Dist: omdev==0.0.0.dev283
+Requires-Dist: omlish==0.0.0.dev283
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.20; extra == "all"

{ominfra-0.0.0.dev281 → ominfra-0.0.0.dev283}/ominfra/scripts/manage.py

@@ -11899,16 +11899,13 @@ class PyenvInstallOpts:
 
 
 # TODO: https://github.com/pyenv/pyenv/blob/master/plugins/python-build/README.md#building-for-maximum-performance
-DEFAULT_PYENV_INSTALL_OPTS = PyenvInstallOpts(
+_DEFAULT_PYENV_INSTALL_OPTS = PyenvInstallOpts(
     opts=[
         '-s',
         '-v',
         '-k',
     ],
     conf_opts=[
-        # FIXME: breaks on mac for older py's
-        '--enable-loadable-sqlite-extensions',
-
         # '--enable-shared',
 
         '--enable-optimizations',
@@ -11924,6 +11921,27 @@ DEFAULT_PYENV_INSTALL_OPTS = PyenvInstallOpts(
     ],
 )
 
+
+def get_default_pyenv_install_opts(
+        version: str,
+        *,
+        platform: ta.Optional[str] = None,
+) -> PyenvInstallOpts:
+    if platform is None:
+        platform = sys.platform
+
+    opts = _DEFAULT_PYENV_INSTALL_OPTS
+
+    ma, mi = map(int, version.split('.')[:2])
+    if not (platform == 'darwin' and (ma, mi) < (3, 11)):
+        opts = dc.replace(opts, conf_opts=[
+            *opts.conf_opts,
+            '--enable-loadable-sqlite-extensions',
+        ])
+
+    return opts
+
+
 DEBUG_PYENV_INSTALL_OPTS = PyenvInstallOpts(opts=['-g'])
 
 THREADED_PYENV_INSTALL_OPTS = PyenvInstallOpts(conf_opts=['--disable-gil'])
@@ -12049,7 +12067,11 @@ class PyenvVersionInstaller:
             if opts is None:
                 opts = PyenvInstallOpts()
         else:
-            lst = [self._given_opts if self._given_opts is not None else DEFAULT_PYENV_INSTALL_OPTS]
+            lst: ta.List[PyenvInstallOpts] = []
+            if self._given_opts is not None:
+                lst.append(self._given_opts)
+            else:
+                lst.append(get_default_pyenv_install_opts(self._version))
             if self._interp_opts.debug:
                 lst.append(DEBUG_PYENV_INSTALL_OPTS)
             if self._interp_opts.threaded:

{ominfra-0.0.0.dev281 → ominfra-0.0.0.dev283}/ominfra/scripts/supervisor.py

@@ -161,7 +161,7 @@ CoroHttpServerFactory = ta.Callable[[SocketAddress], 'CoroHttpServer']
 
 
 ########################################
-# ../exceptions.py
+# ../errors.py
 
 
 class ProcessError(Exception):

{ominfra-0.0.0.dev281 → ominfra-0.0.0.dev283}/ominfra/supervisor/spawningimpl.py

@@ -12,14 +12,14 @@ from omlish.lite.typing import Func3
 from .configs import ProcessConfig
 from .configs import ServerConfig
 from .dispatchers import Dispatchers
+from .errors import BadCommandError
+from .errors import NoPermissionError
+from .errors import NotExecutableError
+from .errors import NotFoundError
+from .errors import ProcessError
 from .events import ProcessCommunicationEvent
 from .events import ProcessCommunicationStderrEvent
 from .events import ProcessCommunicationStdoutEvent
-from .exceptions import BadCommandError
-from .exceptions import NoPermissionError
-from .exceptions import NotExecutableError
-from .exceptions import NotFoundError
-from .exceptions import ProcessError
 from .pipes import ProcessPipes
 from .pipes import close_child_pipes
 from .pipes import close_pipes

{ominfra-0.0.0.dev281 → ominfra-0.0.0.dev283/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev281
+Version: 0.0.0.dev283
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev281
-Requires-Dist: omlish==0.0.0.dev281
+Requires-Dist: omdev==0.0.0.dev283
+Requires-Dist: omlish==0.0.0.dev283
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.20; extra == "all"

{ominfra-0.0.0.dev281 → ominfra-0.0.0.dev283}/ominfra.egg-info/SOURCES.txt

@@ -131,8 +131,8 @@ ominfra/supervisor/__main__.py
 ominfra/supervisor/configs.py
 ominfra/supervisor/dispatchers.py
 ominfra/supervisor/dispatchersimpl.py
+ominfra/supervisor/errors.py
 ominfra/supervisor/events.py
-ominfra/supervisor/exceptions.py
 ominfra/supervisor/groups.py
 ominfra/supervisor/groupsimpl.py
 ominfra/supervisor/http.py

{ominfra-0.0.0.dev281 → ominfra-0.0.0.dev283}/ominfra.egg-info/requires.txt

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

{ominfra-0.0.0.dev281 → ominfra-0.0.0.dev283}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev281'
+version = '0.0.0.dev283'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev281',
-    'omlish == 0.0.0.dev281',
+    'omdev == 0.0.0.dev283',
+    'omlish == 0.0.0.dev283',
 ]
 
 [project.optional-dependencies]