omdev 0.0.0.dev280__tar.gz → 0.0.0.dev282__tar.gz

{omdev-0.0.0.dev280/omdev.egg-info → omdev-0.0.0.dev282}/PKG-INFO

@@ -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 → omdev-0.0.0.dev282}/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-0.0.0.dev280 → omdev-0.0.0.dev282}/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-0.0.0.dev280 → omdev-0.0.0.dev282}/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 → omdev-0.0.0.dev282/omdev.egg-info}/PKG-INFO

@@ -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 → omdev-0.0.0.dev282}/omdev.egg-info/requires.txt

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

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