portable-python 1.10.2__tar.gz → 2.0.0__tar.gz

{portable_python-1.10.2/src/portable_python.egg-info → portable_python-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portable-python
-Version: 1.10.2
+Version: 2.0.0
 Summary: Portable python binaries
 Home-page: https://github.com/codrsquad/portable-python
 Author: Zoran Simic
@@ -18,23 +18,23 @@ Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: System :: Installation/Setup
 Classifier: Topic :: System :: Software Distribution
 Classifier: Topic :: Utilities
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: click~=8.0
 Requires-Dist: pyyaml~=6.0
 Requires-Dist: requests<3.0
-Requires-Dist: runez~=5.0
+Requires-Dist: runez~=5.5
 Requires-Dist: urllib3~=1.26
 Dynamic: author
 Dynamic: author-email

{portable_python-1.10.2 → portable_python-2.0.0}/requirements.txt

@@ -1,5 +1,5 @@
 click~=8.0
 pyyaml~=6.0
 requests<3.0
-runez~=5.0
+runez~=5.5
 urllib3~=1.26

{portable_python-1.10.2 → portable_python-2.0.0}/setup.py

@@ -7,7 +7,7 @@ setup(
     author="Zoran Simic zoran@simicweb.com",
     keywords="python, portable, binary",
     url="https://github.com/codrsquad/portable-python",
-    python_requires=">=3.9",
+    python_requires=">=3.10",
     entry_points={
         "console_scripts": [
             "portable-python = portable_python.__main__:main",
@@ -22,11 +22,11 @@ setup(
         "Operating System :: Unix",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Software Development :: Build Tools",
         "Topic :: System :: Installation/Setup",

{portable_python-1.10.2 → portable_python-2.0.0}/src/portable_python/__init__.py

@@ -222,7 +222,9 @@ class BuildSetup:
             runez.abort("Please provide full desired version: %s is not good enough" % runez.red(python_spec))
 
         self.python_spec = python_spec
-        self.folders = PPG.get_folders(base=os.getcwd(), family=python_spec.family, version=python_spec.version)
+        self.folders = PPG.get_folders(
+            base=os.getcwd(), family=python_spec.family, version=python_spec.version, abi_suffix=python_spec.abi_suffix
+        )
         self.desired_modules = modules
         prefix = self.folders.formatted(prefix)
         self.prefix = prefix
@@ -237,7 +239,9 @@ class BuildSetup:
             self.tarball_name = PPG.target.composed_basename(dest, extension=ext)
 
         else:
-            self.tarball_name = PPG.target.composed_basename(python_spec.family, python_spec.version, extension=ext)
+            self.tarball_name = PPG.target.composed_basename(
+                python_spec.family, python_spec.version, abi_suffix=python_spec.abi_suffix, extension=ext
+            )
 
         builder = PPG.family(python_spec.family).get_builder()
         self.python_builder = builder(self)  # type: PythonBuilder
@@ -605,10 +609,12 @@ class ModuleBuilder:
 
     def run_make(self, *args, program="make", cpu_count=None):
         cmd = program.split()
-        if cpu_count and cpu_count < 0:
+        if cpu_count is None:
             available = multiprocessing.cpu_count()
+            # If we can't retrieve the number of cores, leave cpu_count as None
+            # and we'll omit -j below.
             if available and available > 0:
-                cpu_count += available
+                cpu_count = available
 
         if cpu_count and cpu_count > 1:
             cmd.append("-j%s" % cpu_count)

{portable_python-1.10.2 → portable_python-2.0.0}/src/portable_python/config.py

@@ -17,7 +17,7 @@ folders:
   destdir: "{build}"
   dist: dist
   logs: "{build}/logs"
-  ppp-marker: /ppp-marker/{version}
+  ppp-marker: /ppp-marker/{version}{abi_suffix}
   sources: build/sources
 
 manifest:

{portable_python-1.10.2 → portable_python-2.0.0}/src/portable_python/cpython.py

@@ -8,7 +8,7 @@ import yaml
 from runez.pyenv import Version
 
 from portable_python import LOG, patch_file, patch_folder, PPG, PythonBuilder
-from portable_python.external.xcpython import Bdb, Bzip2, Gdbm, LibFFI, Openssl, Readline, Sqlite, Uuid, Xz, Zlib
+from portable_python.external.xcpython import Bdb, Bzip2, Gdbm, LibFFI, Mpdec, Openssl, Readline, Sqlite, Uuid, Xz, Zlib, Zstd
 from portable_python.external.xtkinter import TkInter
 from portable_python.inspector import LibAutoCorrect, PythonInspector
 
@@ -96,7 +96,7 @@ class Cpython(PythonBuilder):
 
     @classmethod
     def candidate_modules(cls):
-        return [LibFFI, Zlib, Xz, Bzip2, Readline, Openssl, Sqlite, Bdb, Gdbm, Uuid, TkInter]
+        return [LibFFI, Zlib, Zstd, Xz, Bzip2, Readline, Openssl, Sqlite, Bdb, Gdbm, Uuid, TkInter, Mpdec]
 
     @property
     def url(self):
@@ -172,10 +172,37 @@ class Cpython(PythonBuilder):
             yield f"-ltcl{version.mm}"
             yield f"-ltk{version.mm}"
 
+        if self.setup.python_spec.freethreading:
+            yield "--disable-gil"
+
+    def xenv_LIBZSTD_CFLAGS(self):
+        if self.version >= "3.14" and PPG.target.is_macos:
+            # Normally ./configure will autodetect using pkg-config, but
+            # this doesn't typically work on Mac (the pkg-config binary is
+            # in homebrew, which we omit from path) so we have to provide
+            # some hints about how to staticly include it.
+            yield f"-I{self.deps}/include"
+
+    def xenv_LIBZSTD_LIBS(self):
+        if self.version >= "3.14" and PPG.target.is_macos:
+            yield f"{self.deps_lib_dir}/libzstd.a"
+
+    def xenv_LIBMPDEC_CFLAGS(self):
+        if self.version >= "3.14" and PPG.target.is_macos:
+            # Normally ./configure will autodetect using pkg-config, but
+            # this doesn't typically work on Mac (the pkg-config binary is
+            # in homebrew, which we omit from path) so we have to provide
+            # some hints about how to staticly include it.
+            yield f"-I{self.deps}/include"
+
+    def xenv_LIBMPDEC_LIBS(self):
+        if self.version >= "3.14" and PPG.target.is_macos:
+            yield f"{self.deps_lib_dir}/libmpdec.a"
+
     @runez.cached_property
     def prefix_lib_folder(self):
         """Path to <prefix>/lib/pythonM.m folder"""
-        return self.install_folder / f"lib/python{self.version.mm}"
+        return self.install_folder / f"lib/python{self.version.mm}{self.setup.python_spec.abi_suffix}"
 
     @runez.cached_property
     def prefix_config_folder(self):

{portable_python-1.10.2 → portable_python-2.0.0}/src/portable_python/external/_inspect.py

@@ -10,6 +10,7 @@ INSIGHTS = {
     "_tkinter": "TCL_VERSION TK_VERSION",
     "_sqlite3": "sqlite_version version",
     "_ssl": "OPENSSL_VERSION",
+    "_zstd": "zstd_version",
     "dbm.gnu": "_GDBM_VERSION",
     "ensurepip": "_PIP_VERSION",
     "pyexpat": "version_info",

{portable_python-1.10.2 → portable_python-2.0.0}/src/portable_python/external/xcpython.py

@@ -1,3 +1,4 @@
+import os.path
 from typing import ClassVar
 
 import runez
@@ -428,3 +429,78 @@ class Zlib(ModuleBuilder):
         self.run_configure("./configure", self.c_configure_args())
         self.run_make()
         self.run_make("install")
+
+
+class Zstd(ModuleBuilder):
+    """
+    Newer compression format present in most 3.14+ builds
+    """
+
+    m_debian = "!libzstd-dev"
+    m_telltale = "{include}/zstd.h"
+
+    xenv_CFLAGS = "-fPIC"
+
+    def auto_select_reason(self):
+        if self.setup.python_spec.version >= "3.14":
+            if PPG.target.is_macos:
+                return "Required for 3.14 and up"  # Well, "expected" anyway
+            if not self.resolved_telltale:
+                return "Required for 3.14 and up"
+
+    @property
+    def url(self):
+        return (
+            self.cfg_url(self.version) or f"https://github.com/facebook/zstd/releases/download/v{self.version}/zstd-{self.version}.tar.gz"
+        )
+
+    @property
+    def version(self):
+        return self.cfg_version("1.5.7")
+
+    def _do_linux_compile(self):
+        # Notably, this does not build when given a relative path.
+        self.run_make(f"prefix={os.path.abspath(self.deps)}")
+        # the libdir on the resulting .dylib on Mac is wrong, but as long as we
+        # staticly compile this doesn't need a fixup.  I got as far as:
+        # "libdir=\\$(executable_path)/../lib")
+        self.run_make("install", f"prefix={os.path.abspath(self.deps)}")
+
+
+class Mpdec(ModuleBuilder):
+    """
+    Prevent falling back to bundled libmpdec (deprecated and scheduled for removal in Python 3.16)
+    """
+
+    m_debian = "!libmpdec-dev"
+    m_telltale = "{include}/mpdecimal.h"
+
+    xenv_CFLAGS = "-fPIC"
+
+    def auto_select_reason(self):
+        if self.setup.python_spec.version >= "3.16":
+            if PPG.target.is_macos:
+                return "Required for 3.16 and up"
+            if not self.resolved_telltale:
+                return "Required for 3.16 and up"
+
+    @property
+    def url(self):
+        return self.cfg_url(self.version) or f"https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-{self.version}.tar.gz"
+
+    @property
+    def version(self):
+        return self.cfg_version("4.0.1")
+
+    def c_configure_args(self):
+        if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir):
+            yield config_args
+
+        else:
+            pass  # yield "--static"
+        yield "--disable-cxx"
+
+    def _do_linux_compile(self):
+        self.run_configure("./configure", self.c_configure_args())
+        self.run_make()
+        self.run_make("install")

{portable_python-1.10.2 → portable_python-2.0.0}/src/portable_python/inspector.py

@@ -397,7 +397,7 @@ def get_lib_type(install_folder, path, basename):
 
 
 class PythonInspector:
-    default = "_bz2,_ctypes,_curses,_decimal,_dbm,_gdbm,_lzma,_tkinter,_sqlite3,_ssl,_uuid,pip,readline,pyexpat,setuptools,zlib"
+    default = "_bz2,_ctypes,_curses,_decimal,_dbm,_gdbm,_lzma,_tkinter,_sqlite3,_ssl,_uuid,_zstd,pip,readline,pyexpat,setuptools,zlib"
     additional = "_asyncio,_functools,_tracemalloc,dbm.gnu,ensurepip,ossaudiodev,spwd,sys,tkinter,venv,wheel"
 
     def __init__(self, spec, modules=None):

{portable_python-1.10.2 → portable_python-2.0.0}/src/portable_python/versions.py

@@ -117,13 +117,13 @@ class CPythonFamily(VersionFamily):
 
 
 class Folders:
-    def __init__(self, config: Config, base=None, family=None, version=None):
+    def __init__(self, config: Config, base=None, family=None, version=None, abi_suffix=None):
         self.config = config
         self.base_folder = runez.resolved_path(base)
         self.family = family
         self.version = Version.from_object(version)
         self.mm = self.version and self.version.mm
-        self.completions = config.completions(family=family, version=version, mm=self.mm)
+        self.completions = config.completions(family=family, version=version, mm=self.mm, abi_suffix=abi_suffix or "")
         self.build_folder = self._get_path("build")
         self.completions["build"] = self.build_folder
         self.components = self.build_folder / "components"
@@ -197,9 +197,9 @@ class PPG:
         cls.target = cls.config.target
 
     @classmethod
-    def get_folders(cls, base=None, family="cpython", version=None):
+    def get_folders(cls, base=None, family="cpython", version=None, abi_suffix=None):
         config = cls.config or Config()
-        return Folders(config, base=base, family=family, version=version)
+        return Folders(config, base=base, family=family, version=version, abi_suffix=abi_suffix)
 
     @classmethod
     def family(cls, family_name, fatal=True) -> VersionFamily:

{portable_python-1.10.2 → portable_python-2.0.0/src/portable_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portable-python
-Version: 1.10.2
+Version: 2.0.0
 Summary: Portable python binaries
 Home-page: https://github.com/codrsquad/portable-python
 Author: Zoran Simic
@@ -18,23 +18,23 @@ Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: System :: Installation/Setup
 Classifier: Topic :: System :: Software Distribution
 Classifier: Topic :: Utilities
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: click~=8.0
 Requires-Dist: pyyaml~=6.0
 Requires-Dist: requests<3.0
-Requires-Dist: runez~=5.0
+Requires-Dist: runez~=5.5
 Requires-Dist: urllib3~=1.26
 Dynamic: author
 Dynamic: author-email

{portable_python-1.10.2 → portable_python-2.0.0}/src/portable_python.egg-info/requires.txt

@@ -1,5 +1,5 @@
 click~=8.0
 pyyaml~=6.0
 requests<3.0
-runez~=5.0
+runez~=5.5
 urllib3~=1.26