omdev 0.0.0.dev280__py3-none-any.whl → 0.0.0.dev282__py3-none-any.whl

omdev/interp/pyenv/install.py

@@ -38,16 +38,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',
@@ -63,6 +60,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'])
@@ -188,7 +206,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:

omdev/scripts/interp.py

@@ -4988,16 +4988,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',
@@ -5013,6 +5010,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'])
@@ -5138,7 +5156,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:

omdev/scripts/pyproject.py

@@ -7561,16 +7561,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',
@@ -7586,6 +7583,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'])
@@ -7711,7 +7729,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:

{omdev-0.0.0.dev280.dist-info → omdev-0.0.0.dev282.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev280
+Version: 0.0.0.dev282
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev280
+Requires-Dist: omlish==0.0.0.dev282
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev280.dist-info → omdev-0.0.0.dev282.dist-info}/RECORD

@@ -142,7 +142,7 @@ omdev/interp/providers/standalone.py,sha256=jJnncea4PIuaW-KwD2YiWDn8zTmwmsJNUKpF
 omdev/interp/providers/system.py,sha256=2HnvN70fJyolfzRSay_gJbwS2JLuURp1VOKg2oc88ts,3985
 omdev/interp/pyenv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/interp/pyenv/inject.py,sha256=JZCSvkLYj5x_2LWScgYVOpmPrwrYQ8YVv7OeHbcH53s,605
-omdev/interp/pyenv/install.py,sha256=LX5jDzQQR1X0C9OKi4masKWoMU3ms8XCfQPXS2kTZKI,7818
+omdev/interp/pyenv/install.py,sha256=j9DrT7w5yZRhoDLTcZJCmhWXinXNqx0QSXwW2JabMgU,8346
 omdev/interp/pyenv/provider.py,sha256=RvPWnT5Fpj85gYxfw9o8E4kNtgvM0AcXk8_7FUk7rTs,4445
 omdev/interp/pyenv/pyenv.py,sha256=1Gt77di-lxeje9SnNYCWhYRo7CHdhTWZD0whvPanNP8,2643
 omdev/interp/uv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -214,8 +214,8 @@ omdev/scripts/ci.py,sha256=Z2Tufq5f072q7BQzvcqBpwLkvhBaqagA7lEbeazLXMg,333891
 omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
 omdev/scripts/exectime.py,sha256=S2O4MgtzTsFOY2IUJxsrnOIame9tEFc6aOlKP-F1JSg,1541
 omdev/scripts/importtrace.py,sha256=NjRilVNBugswrNflIhPCPHRTd-vIijqSZ8C7J8lariI,14038
-omdev/scripts/interp.py,sha256=B3YviHFRbJoom4dvmGdJ7Y0LiWWpE6p1igEme4IWspU,151083
-omdev/scripts/pyproject.py,sha256=_WVVYRdyzgMKnuNYyjwduerjYFugZjdHgwAA-eUgCrQ,260133
+omdev/scripts/interp.py,sha256=HPJQlV2PEdVCcDto3MI9SWS-LmngPGJ05jbGXMCsx3g,151611
+omdev/scripts/pyproject.py,sha256=dcWEUuHsE8_zIJ26s8MMlPlFgJzlE49kVhh2sQLDlKQ,260661
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -254,9 +254,9 @@ omdev/tools/json/rendering.py,sha256=tMcjOW5edfozcMSTxxvF7WVTsbYLoe9bCKFh50qyaGw
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev280.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev280.dist-info/METADATA,sha256=ePfJ-a7HrQL1maCjcSUNxl0LNecSI2Sooq4fWdvZgRA,1588
-omdev-0.0.0.dev280.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-omdev-0.0.0.dev280.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev280.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev280.dist-info/RECORD,,
+omdev-0.0.0.dev282.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev282.dist-info/METADATA,sha256=r2Lfs-wg3GiySKVrdY6UMsqfmklwBh7KSNswxGHChU0,1588
+omdev-0.0.0.dev282.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+omdev-0.0.0.dev282.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev282.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev282.dist-info/RECORD,,