ominfra 0.0.0.dev281__py3-none-any.whl → 0.0.0.dev283__py3-none-any.whl

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/scripts/supervisor.py

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

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.dist-info → ominfra-0.0.0.dev283.dist-info}/METADATA

@@ -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.dist-info → ominfra-0.0.0.dev283.dist-info}/RECORD

@@ -14,7 +14,7 @@ ominfra/clouds/aws/logs.py,sha256=SvOMv5FeRFhxneIyMXCeieyLFpi6byHUsHwOAhFvT0U,54
 ominfra/clouds/aws/metadata.py,sha256=XR1BuMdQheyeFjjA3MN8GCNWVAp5ahoPdbWXEmViutQ,2767
 ominfra/clouds/aws/instancetypes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/aws/instancetypes/__main__.py,sha256=Jsrv3P7LX2Cg08W7ByZfZ1JQT4lgLDPW1qNAmShFuMk,75
-ominfra/clouds/aws/instancetypes/cache.json.gz,sha256=6R_japqzYY_hLUat95SMyWUr_BvkqeafCB2EyOouYn0,26626
+ominfra/clouds/aws/instancetypes/cache.json.gz,sha256=27o2kaDNEhaA7quLT-G4oTLOfsVJ5vr80UK6fcic5Lo,27625
 ominfra/clouds/aws/instancetypes/cache.py,sha256=CrfBzOb0DqQhf3ahQS6qQHHH1kVgZyniYOl22RTvjwo,333
 ominfra/clouds/aws/instancetypes/cli.py,sha256=WC0SWkdw9F0CJVnxcedPIYccYsczKjMKdeW5yPbfc8Y,2200
 ominfra/clouds/aws/journald2aws/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -113,16 +113,16 @@ ominfra/manage/targets/inject.py,sha256=P4597xWM-V3I_gCt2O71OLhYQkkXtuJvkYRsIbhh
 ominfra/manage/targets/targets.py,sha256=7GP6UAZyJFEhpkJN6UQdpr_WN3p7C76v-s445y-WB6U,1885
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/scripts/journald2aws.py,sha256=IgF4hmmjQv_bVEETNci4k6mtGRWuiGeW90mvWl14BAI,171170
-ominfra/scripts/manage.py,sha256=OlfubrtGmXWAyUOO6eHOj-k4XmfDPrngdKTLlm6yLZA,380865
-ominfra/scripts/supervisor.py,sha256=9fEgMFPZMRGk7uBVdywzR_E5Y6_xTxUw3zUs_SCu17o,299748
+ominfra/scripts/manage.py,sha256=uOt6cOXKvMWfmNkc2niBN-tL4f1A6Xjo2UXZf_hBOLU,381393
+ominfra/scripts/supervisor.py,sha256=6HQRQE8CGVXZKUhs9ZcOUSS6sLdgAfSxl0qs5fdxaJ4,299744
 ominfra/supervisor/LICENSE.txt,sha256=ZrHY15PVR98y26Yg6iQfa-SXnUaYTDhrUsPVcEO5OKM,1874
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
 ominfra/supervisor/configs.py,sha256=zpNZmei-Ajild6WNIGnxsPMGbGBFzr0K81L_gR0vBIA,13847
 ominfra/supervisor/dispatchers.py,sha256=zXLwQS4Vc6dWw5o9QOL04UMDt7w6CKu9wf19CjUiS2Q,1005
 ominfra/supervisor/dispatchersimpl.py,sha256=q3dEyOHWTPKm28nmAGisjgIW1BX6O3-SzbYa7nWuTEs,11349
+ominfra/supervisor/errors.py,sha256=Qbu211H3CLlSmi9LsSikOwrcL5HgJP9ugvcKWlGTAoI,750
 ominfra/supervisor/events.py,sha256=XGrtzHr1xm0dwjz329fn9eR0_Ap-LQL6Sk8LJ8eVDEo,6692
-ominfra/supervisor/exceptions.py,sha256=Qbu211H3CLlSmi9LsSikOwrcL5HgJP9ugvcKWlGTAoI,750
 ominfra/supervisor/groups.py,sha256=MBbsbt8Zh_WEYkGOr1KXa82gnPVw9wPB2lAnqhugXSc,2457
 ominfra/supervisor/groupsimpl.py,sha256=PCDyc_Wc-pnvIj56_aEyiA5exCpK6n9iErqnJzO2rZk,2281
 ominfra/supervisor/http.py,sha256=LxhF-C7VyZ8WxzjhrHSLU9rCo26OF81IgZzvqSaCYtk,3449
@@ -137,7 +137,7 @@ ominfra/supervisor/setup.py,sha256=7HwwwI-WT_Z0WjZ9_l5Orr4K298nKKhQ1f_ZgGsi9TU,6
 ominfra/supervisor/setupimpl.py,sha256=88h3oYsdJ0LAo7sZZZGRQti14oQay3b-0Vd_h3Cl108,9638
 ominfra/supervisor/signals.py,sha256=jY52naUifcAjd6nICTP1ZW3IQSPsHB4cvbsJo8_QV_U,2196
 ominfra/supervisor/spawning.py,sha256=i1k3tmqWyU-KIN7kel-JVxTVGnLiTIVmZzlstJSZpjM,622
-ominfra/supervisor/spawningimpl.py,sha256=rWlL-yumu5I1QGhN08XWHVi5HlNPMPkt08D4jEMb_wU,11104
+ominfra/supervisor/spawningimpl.py,sha256=L293m1mCvR12FYmjATwgb0GgZRRLw-1jlNd8XmkvpUU,11084
 ominfra/supervisor/states.py,sha256=x1trJQbItkSegOmotpn5YNcZMLbBL8I3GmhvFCQl4Oo,1400
 ominfra/supervisor/supervisor.py,sha256=XsQrWjMsv0o0CzI5nZoGybeUnSDouc8X7jSLr920_eQ,8169
 ominfra/supervisor/types.py,sha256=g6C-NuPWMy7pk-kcnT3mO7auLWElZU_4dhzrUaX--TA,4015
@@ -156,9 +156,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=3FnJbgpLw6gInTfhERd1mDy9ijjMUGxkdYVo43Tnxx4,3555
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=auGP1LlbBJSFKUWNvQo_UzA8IsBNZBTMwEkFFRJ4FX4,6185
-ominfra-0.0.0.dev281.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev281.dist-info/METADATA,sha256=wYWffl_0If3Nrk6BPZTq6f7Ag7EQec0b55NZivPjmNQ,753
-ominfra-0.0.0.dev281.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-ominfra-0.0.0.dev281.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev281.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev281.dist-info/RECORD,,
+ominfra-0.0.0.dev283.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev283.dist-info/METADATA,sha256=jGNh_5GmmTMamXGV1LwpGTHVSCGTUTkH9KbmtQjl69s,753
+ominfra-0.0.0.dev283.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+ominfra-0.0.0.dev283.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev283.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev283.dist-info/RECORD,,