Merge remote-tracking branch 'origin/main' into jwiltse/add_lib64_dir

Author: jwiltse

.github/workflows/tests.yml

@@ -13,28 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - run: pip install -U pip tox
-    - run: tox -e py
-    - uses: codecov/codecov-action@v3
-      with:
-        files: .tox/test-reports/coverage.xml
-
-  test-eol:
-    # EOL-ed versions of python are exercised on older linux distros for a while longer
-    # Testing against these versions will eventually be retired
-    runs-on: ubuntu-20.04
-
-    strategy:
-      matrix:
-        python-version: ["3.6", "3.7"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
     - uses: actions/checkout@v4

portable-python.yml

@@ -19,3 +19,38 @@ folders:
 cpython-additional-packages:
 #  - Pillow==10.0.0
 #  - flake8==6.0.0
+
+# Uncomment to download, compile and statically link Python module dependencies
+# cpython-modules: libffi zlib xz bzip2 openssl uuid sqlite
+
+# Uncomment to override a dependency version
+# libffi-version: 3.3
+
+# Uncomment to override cpython or a dependency source URL
+# Note: string "$version" will be replaced with version string (e.g. 1.2.3)
+# cpython-url: https://my-cpython-mirror/cpython-$version.tar.gz
+# zlib-url: https://my-zlib-mirror/zlib-$version.tar.gz
+
+# Uncomment to override the ./configure arguments for a dependency
+# Note: this will replace the default arguments, not extend them
+# Note: the string "$deps_lib" will be replaced with the output libs directory for the module
+# openssl-configure: -v --openssldir=/etc/ssl no-shared no-idea no-tests no-dso
+
+# Note: It's also possible to set configure args per platform/arch
+# linux:
+  # openssl-configure: --with-terminfo-dirs=/etc/terminfo:/lib/terminfo:/usr/share/terminfo
+# macos:
+  # openssl-configure: --with-terminfo-dirs=/usr/share/terminfo
+
+# Note: you can also use one argument per line syntax
+# openssl-configure:
+#  - -v
+#  - --openssldir=/etc/ssl
+
+
+# Uncomment if you need to patch the source code of a module before compiling it
+#cpython-modules: zlib
+#zlib-patches:
+#  - file: configure
+#    regex: "# start off configure.log"
+#    replacement: "echo starting zlib configure script with patches"

setup.py

@@ -7,7 +7,7 @@
     author="Zoran Simic zoran@simicweb.com",
     keywords="python, portable, binary",
     url="https://github.com/codrsquad/portable-python",
-    python_requires=">=3.6",
+    python_requires=">=3.8",
     entry_points={
         "console_scripts": [
             "portable-python = portable_python.__main__:main",
@@ -22,13 +22,12 @@
         "Operating System :: Unix",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "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 :: Implementation :: CPython",
         "Topic :: Software Development :: Build Tools",
         "Topic :: System :: Installation/Setup",

src/portable_python/__init__.py

@@ -15,6 +15,7 @@
 import os
 import pathlib
 import re
+from string import Template
 from typing import ClassVar, List
 
 import runez
@@ -491,6 +492,19 @@ def is_usable_module(self, name):
     def cfg_version(self, default):
         return PPG.config.get_value("%s-version" % self.m_name) or default
 
+    def cfg_url(self, version):
+        if config_url := PPG.config.get_value("%s-url" % self.m_name):
+            url_template = Template(config_url)
+            return url_template.substitute(version=version)
+
+    def cfg_configure(self, deps_lib):
+        if configure := PPG.config.get_value("%s-configure" % self.m_name):
+            configure_template = Template(configure)
+            return configure_template.substitute(deps_lib=deps_lib)
+
+    def cfg_patches(self):
+        return PPG.config.get_value("%s-patches" % self.m_name)
+
     @property
     def url(self):
         """Url of source tarball, if any"""
@@ -650,6 +664,7 @@ def compile(self):
                         folder = folder / self.m_build_cwd
 
                     with runez.CurrentFolder(folder):
+                        self._apply_patches()
                         self._prepare()
                         func()
                         self._finalize()
@@ -663,6 +678,15 @@ def compile(self):
                     else:
                         os.environ[k] = v
 
+    def _apply_patches(self):
+        if patches := self.cfg_patches():
+            for patch in patches:
+                if runez.DRYRUN:
+                    print(f"Would apply patch: {patch}")
+                else:
+                    print(f"Applying patch: {patch}")
+                    patch_file(patch["file"], patch["regex"], patch["replacement"])
+
     def _get_env_vars(self):
         """Yield all found env vars, first found wins"""
         result = {}

src/portable_python/cpython.py

@@ -8,8 +8,8 @@
 from runez.pyenv import Version
 
 from portable_python import LOG, patch_file, patch_folder, PPG, PythonBuilder
-from portable_python.external.tkinter import TkInter
 from portable_python.external.xcpython import Bdb, Bzip2, Gdbm, LibFFI, Openssl, Readline, Sqlite, Uuid, Xz, Zlib
+from portable_python.external.xtkinter import TkInter
 from portable_python.inspector import LibAutoCorrect, PythonInspector
 
 # https://github.com/docker-library/python/issues/160
@@ -104,6 +104,9 @@ def url(self):
         if PPG.config.get_value("cpython-use-github"):
             return f"https://github.com/python/cpython/archive/refs/tags/v{self.version}.tar.gz"
 
+        if cfg_url := self.cfg_url(self.version):
+            return cfg_url
+
         return f"https://www.python.org/ftp/python/{self.version.main}/Python-{self.version}.tar.xz"
 
     def xenv_LDFLAGS_NODIST(self):
@@ -231,7 +234,7 @@ def _finalize(self):
 
                 self.run_python(cmd)
 
-            self.run_python("-mpip", "install", *runez.flattened(additional))
+            self.run_python("-mpip", "install", "--no-cache-dir", "--upgrade", *runez.flattened(additional))
 
         runez.abort_if(not runez.DRYRUN and not self.bin_python, f"Can't find bin/python in {self.bin_folder}")
         PPG.config.ensure_main_file_symlinks(self)