portable-python 1.9.6__tar.gz → 1.9.8__tar.gz

{portable_python-1.9.6/src/portable_python.egg-info → portable_python-1.9.8}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: portable-python
-Version: 1.9.6
+Version: 1.9.8
 Summary: Portable python binaries
 Home-page: https://github.com/codrsquad/portable-python
 Author: Zoran Simic
@@ -18,19 +18,18 @@ Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 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 :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: System :: Installation/Setup
 Classifier: Topic :: System :: Software Distribution
 Classifier: Topic :: Utilities
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: click~=8.0
@@ -38,6 +37,18 @@ Requires-Dist: pyyaml~=6.0
 Requires-Dist: requests<3.0
 Requires-Dist: runez~=5.0
 Requires-Dist: urllib3~=1.26
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 Portable python binaries
 ========================

{portable_python-1.9.6 → portable_python-1.9.8}/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.6",
+    python_requires=">=3.8",
     entry_points={
         "console_scripts": [
             "portable-python = portable_python.__main__:main",
@@ -22,13 +22,12 @@ setup(
         "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",

{portable_python-1.9.6 → portable_python-1.9.8}/src/portable_python/__init__.py

@@ -15,6 +15,7 @@ import multiprocessing
 import os
 import pathlib
 import re
+from string import Template
 from typing import ClassVar, List
 
 import runez
@@ -491,6 +492,19 @@ class ModuleBuilder:
     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_dir, deps_lib64_dir):
+        if configure := PPG.config.get_value("%s-configure" % self.m_name):
+            configure_template = Template(configure)
+            return configure_template.substitute(lib_dir=deps_lib_dir, lib64_dir=deps_lib64_dir)
+
+    def cfg_patches(self):
+        return PPG.config.get_value("%s-patches" % self.m_name)
+
     @property
     def url(self):
         """Url of source tarball, if any"""
@@ -507,9 +521,20 @@ class ModuleBuilder:
         return self.setup.folders.deps
 
     @property
-    def deps_lib(self):
+    def deps_lib_dir(self):
         return self.deps / "lib"
 
+    @property
+    def deps_lib64_dir(self):
+        return self.deps / "lib64"
+
+    @property
+    def deps_lib_dirs(self):
+        lib_dirs = [self.deps_lib_dir]
+        if self.deps_lib64_dir.exists():
+            lib_dirs.append(self.deps_lib64_dir)
+        return lib_dirs
+
     def xenv_CPATH(self):
         folder = self.deps / "include"
         if folder.exists():
@@ -522,7 +547,7 @@ class ModuleBuilder:
 
     def xenv_LDFLAGS(self):
         if self.modules.selected:
-            yield f"-L{self.deps_lib}"
+            yield from (f"-L{lib_dir}" for lib_dir in self.deps_lib_dirs)
 
     def xenv_PATH(self):
         yield f"{self.deps}/bin"
@@ -536,7 +561,7 @@ class ModuleBuilder:
     def xenv_PKG_CONFIG_PATH(self):
         yield from os.environ.get("PKG_CONFIG_PATH", "").split(":")
         if self.modules.selected:
-            yield f"{self.deps_lib}/pkgconfig"
+            yield from (f"{lib_dir}/pkgconfig" for lib_dir in self.deps_lib_dirs)
 
     def _do_run(self, program, *args, fatal=True, env=None):
         return runez.run(program, *args, passthrough=self._log_handler, stdout=None, stderr=None, fatal=fatal, env=env)
@@ -639,6 +664,7 @@ class ModuleBuilder:
                         folder = folder / self.m_build_cwd
 
                     with runez.CurrentFolder(folder):
+                        self._apply_patches()
                         self._prepare()
                         func()
                         self._finalize()
@@ -652,6 +678,15 @@ class ModuleBuilder:
                     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 = {}
@@ -747,10 +782,12 @@ class PythonBuilder(ModuleBuilder):
         # Some libs get funky permissions for some reason
         super()._prepare()
         self.setup.ensure_clean_folder(self.install_folder)
-        for path in runez.ls_dir(self.deps_lib):
-            if not path.name.endswith(".la"):
-                expected = 0o755 if path.is_dir() else 0o644
-                current = path.stat().st_mode & 0o777
-                if current != expected:
-                    LOG.info("Corrected permissions for %s (was %s)", runez.short(path), oct(current))
-                    path.chmod(expected)
+
+        for lib_dir in self.deps_lib_dirs:
+            for path in runez.ls_dir(lib_dir):
+                if not path.name.endswith(".la"):
+                    expected = 0o755 if path.is_dir() else 0o644
+                    current = path.stat().st_mode & 0o777
+                    if current != expected:
+                        LOG.info("Corrected permissions for %s (was %s)", runez.short(path), oct(current))
+                        path.chmod(expected)

{portable_python-1.9.6 → portable_python-1.9.8}/src/portable_python/cpython.py

@@ -8,8 +8,8 @@ import yaml
 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,10 +104,13 @@ class Cpython(PythonBuilder):
         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):
-        yield f"-L{self.deps_lib}"
+        yield from (f"-L{lib_dir}" for lib_dir in self.deps_lib_dirs)
         if PPG.target.is_linux:
             yield "-Wl,-z,origin"
             # rpath intentionally long to give 'patchelf' some room
@@ -139,7 +142,7 @@ class Cpython(PythonBuilder):
 
         if not self.has_configure_opt("--with-system-ffi"):
             if self.active_module(LibFFI):
-                yield f"LIBFFI_INCLUDEDIR={self.deps_lib}"
+                yield f"LIBFFI_INCLUDEDIR={self.deps_lib_dir}"
                 yield "--with-system-ffi=no"
 
             else:
@@ -163,7 +166,11 @@ class Cpython(PythonBuilder):
             # TODO: this doesn't seem to be enough, on macos cpython's ./configure still picks up the shared macos tcl/tk libs
             version = Version(tkinter.version)
             yield f"--with-tcltk-includes=-I{self.deps}/include"
-            yield f"--with-tcltk-libs=-L{self.deps_lib} -ltcl{version.mm} -ltk{version.mm}"
+
+            lib_dir_flags = " ".join(f"-L{lib_dir}" for lib_dir in self.deps_lib_dirs)
+            yield f"--with-tcltk-libs={lib_dir_flags}"
+            yield f"-ltcl{version.mm}"
+            yield f"-ltk{version.mm}"
 
     @runez.cached_property
     def prefix_lib_folder(self):
@@ -229,7 +236,7 @@ class Cpython(PythonBuilder):
 
                 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)

{portable_python-1.9.6 → portable_python-1.9.8}/src/portable_python/external/xcpython.py

@@ -21,14 +21,24 @@ class Bdb(ModuleBuilder):
 
     @property
     def url(self):
-        return f"https://ftp.osuosl.org/pub/blfs/conglomeration/db/db-{self.version}.tar.gz"
+        return self.cfg_url(self.version) or f"https://ftp.osuosl.org/pub/blfs/conglomeration/db/db-{self.version}.tar.gz"
 
     @property
     def version(self):
         return self.cfg_version("6.2.32")
 
+    def c_configure_args(self):
+        if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir):
+            yield config_args
+
+        else:
+            yield "--enable-shared=no"
+            yield "--enable-static=yes"
+            yield "--enable-dbm"
+            yield "--with-pic=yes"
+
     def _do_linux_compile(self):
-        self.run_configure("../dist/configure", "--enable-shared=no", "--enable-static=yes", "--enable-dbm", "--with-pic=yes")
+        self.run_configure("../dist/configure", self.c_configure_args())
         self.run_make()
         self.run_make("install")
 
@@ -46,7 +56,7 @@ class Bzip2(ModuleBuilder):
 
     @property
     def url(self):
-        return f"https://sourceware.org/pub/bzip2/bzip2-{self.version}.tar.gz"
+        return self.cfg_url(self.version) or f"https://sourceware.org/pub/bzip2/bzip2-{self.version}.tar.gz"
 
     @property
     def version(self):
@@ -70,27 +80,30 @@ class Gdbm(ModuleBuilder):
 
     @property
     def url(self):
-        return f"https://ftp.gnu.org/gnu/gdbm/gdbm-{self.version}.tar.gz"
+        return self.cfg_url(self.version) or f"https://ftp.gnu.org/gnu/gdbm/gdbm-{self.version}.tar.gz"
 
     @property
     def version(self):
         return self.cfg_version("1.24")
 
+    def c_configure_args(self):
+        if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir):
+            yield config_args
+
+        else:
+            yield "--enable-shared=no"
+            yield "--enable-static=yes"
+            yield "--with-pic=yes"
+            yield "--disable-nls"
+            yield "--disable-dependency-tracking"
+            yield "--disable-rpath"
+            yield "--disable-silent-rules"
+            yield "--without-libiconv-prefix"
+            yield "--without-libintl-prefix"
+            yield "--without-readline"
+
     def _do_linux_compile(self):
-        self.run_configure(
-            "./configure",
-            "--enable-shared=no",
-            "--enable-static=yes",
-            "--with-pic=yes",
-            "--enable-libgdbm-compat",
-            "--disable-dependency-tracking",
-            "--disable-nls",
-            "--disable-rpath",
-            "--disable-silent-rules",
-            "--without-libiconv-prefix",
-            "--without-libintl-prefix",
-            "--without-readline",
-        )
+        self.run_configure("./configure", self.c_configure_args())
         self.run_make()
         self.run_make("install")
         runez.move(self.deps / "include/ndbm.h", self.deps / "include/gdbm-ndbm.h")
@@ -110,21 +123,27 @@ class LibFFI(ModuleBuilder):
 
     @property
     def url(self):
-        return f"https://github.com/libffi/libffi/releases/download/v{self.version}/libffi-{self.version}.tar.gz"
+        return (
+            self.cfg_url(self.version) or f"https://github.com/libffi/libffi/releases/download/v{self.version}/libffi-{self.version}.tar.gz"
+        )
 
     @property
     def version(self):
         return self.cfg_version("3.4.6")
 
+    def c_configure_args(self):
+        if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir):
+            yield config_args
+
+        else:
+            yield "--enable-shared=no"
+            yield "--enable-static=yes"
+            yield "--with-pic=yes"
+            yield PPG.target.is_macos and "--disable-multi-os-directory"
+            yield "--disable-docs"
+
     def _do_linux_compile(self):
-        self.run_configure(
-            "./configure",
-            "--enable-shared=no",
-            "--enable-static=yes",
-            "--with-pic=yes",
-            PPG.target.is_macos and "--disable-multi-os-directory",
-            "--disable-docs",
-        )
+        self.run_configure("./configure", self.c_configure_args())
         self.run_make()
         self.run_make("install")
 
@@ -146,7 +165,10 @@ class Openssl(ModuleBuilder):
         if self.version and self.version.startswith("1.1.1"):
             # Not sure why URL suddenly changed for this on github...
             vfolder = self.version.replace(".", "_")
-            return f"https://github.com/openssl/openssl/releases/download/OpenSSL_{vfolder}/openssl-{self.version}.tar.gz"
+            return (
+                self.cfg_url(self.version)
+                or f"https://github.com/openssl/openssl/releases/download/OpenSSL_{vfolder}/openssl-{self.version}.tar.gz"
+            )
 
         return f"https://github.com/openssl/openssl/releases/download/openssl-{self.version}/openssl-{self.version}.tar.gz"
 
@@ -157,11 +179,16 @@ class Openssl(ModuleBuilder):
         return self.cfg_version("3.0.15")
 
     def c_configure_args(self):
-        yield "--openssldir=/etc/ssl"
-        yield "no-shared", "no-idea", "no-tests"
+        if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir):
+            yield config_args
+
+        else:
+            yield "-v"
+            yield "--openssldir=/etc/ssl"
+            yield "no-shared", "no-idea", "no-tests"
 
     def _do_linux_compile(self):
-        self.run_configure("./config", "-v", self.c_configure_args())
+        self.run_configure("./config", self.c_configure_args())
         self.run_make("depend")
         self.run_make()
         self.run_make("install_sw")  # See https://github.com/openssl/openssl/issues/8170
@@ -174,33 +201,37 @@ class Ncurses(ModuleBuilder):
 
     @property
     def url(self):
-        return f"https://ftp.gnu.org/pub/gnu/ncurses/ncurses-{self.version}.tar.gz"
+        return self.cfg_url(self.version) or f"https://ftp.gnu.org/pub/gnu/ncurses/ncurses-{self.version}.tar.gz"
 
     @property
     def version(self):
         return self.cfg_version("6.5")
 
     def c_configure_args(self):
-        yield "--disable-shared"
-        yield "--enable-static"
-        yield "--without-ada"
-        yield "--disable-db-install"
-        yield "--without-manpages"
-        yield "--without-progs"
-        yield "--without-tests"
-        yield f"--with-pkg-config-libdir={self.deps_lib}/pkgconfig"
-        yield "--enable-pc-files"
-        yield "--with-debug=no"
-        yield "--with-gpm=no"
-        yield "--enable-widec"
-        yield "--enable-symlinks"
-        yield "--enable-sigwinch"
-        yield "--without-develop"
-        if PPG.target.is_linux:
-            yield "--with-terminfo-dirs=/etc/terminfo:/lib/terminfo:/usr/share/terminfo"
-
-        if PPG.target.is_macos:
-            yield "--with-terminfo-dirs=/usr/share/terminfo"
+        if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir):
+            yield config_args
+
+        else:
+            yield "--disable-shared"
+            yield "--enable-static"
+            yield "--without-ada"
+            yield "--disable-db-install"
+            yield "--without-manpages"
+            yield "--without-progs"
+            yield "--without-tests"
+            yield f"--with-pkg-config-libdir={self.deps_lib_dir}/pkgconfig"
+            yield "--enable-pc-files"
+            yield "--with-debug=no"
+            yield "--with-gpm=no"
+            yield "--enable-widec"
+            yield "--enable-symlinks"
+            yield "--enable-sigwinch"
+            yield "--without-develop"
+            if PPG.target.is_linux:
+                yield "--with-terminfo-dirs=/etc/terminfo:/lib/terminfo:/usr/share/terminfo"
+
+            if PPG.target.is_macos:
+                yield "--with-terminfo-dirs=/usr/share/terminfo"
 
     def _do_linux_compile(self):
         self.run_configure("./configure", self.c_configure_args())
@@ -227,23 +258,27 @@ class Readline(ModuleBuilder):
 
     @property
     def url(self):
-        return f"https://ftp.gnu.org/gnu/readline/readline-{self.version}.tar.gz"
+        return self.cfg_url(self.version) or f"https://ftp.gnu.org/gnu/readline/readline-{self.version}.tar.gz"
 
     @property
     def version(self):
         return self.cfg_version("8.2.13")
 
+    def c_configure_args(self):
+        if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir):
+            yield config_args
+
+        else:
+            yield "--enable-shared=no"
+            yield "--enable-static=yes"
+            yield "--with-curses"
+            yield "--enable-multibyte"
+            yield "--disable-install-examples"
+            yield "--disable-docs"
+            yield "--enable-portable-binary"
+
     def _do_linux_compile(self):
-        self.run_configure(
-            "./configure",
-            "--disable-shared",
-            "--enable-static",
-            "--with-curses",
-            "--enable-multibyte",
-            "--disable-install-examples",
-            "--disable-docs",
-            "--enable-portable-binary",
-        )
+        self.run_configure("./configure", self.c_configure_args())
         self.run_make()
         self.run_make("install")
 
@@ -267,21 +302,25 @@ class Sqlite(ModuleBuilder):
 
     @property
     def url(self):
-        return f"https://github.com/sqlite/sqlite/archive/refs/tags/version-{self.version}.tar.gz"
+        return self.cfg_url(self.version) or f"https://github.com/sqlite/sqlite/archive/refs/tags/version-{self.version}.tar.gz"
 
     @property
     def version(self):
         return self.cfg_version("3.47.0")
 
+    def c_configure_args(self):
+        if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir):
+            yield config_args
+
+        else:
+            yield "--enable-shared=no"
+            yield "--enable-static=yes"
+            yield "--disable-tcl"
+            yield "--disable-readline"
+            yield "--with-pic=yes"
+
     def _do_linux_compile(self):
-        self.run_configure(
-            "./configure",
-            "--enable-shared=no",
-            "--enable-static=yes",
-            "--disable-tcl",
-            "--disable-readline",
-            "--with-pic=yes",
-        )
+        self.run_configure("./configure", self.c_configure_args())
         self.run_make()
         self.run_make("install")
 
@@ -300,14 +339,23 @@ class Uuid(ModuleBuilder):
 
     @property
     def url(self):
-        return f"https://sourceforge.net/projects/libuuid/files/libuuid-{self.version}.tar.gz"
+        return self.cfg_url(self.version) or f"https://sourceforge.net/projects/libuuid/files/libuuid-{self.version}.tar.gz"
 
     @property
     def version(self):
         return self.cfg_version("1.0.3")
 
+    def c_configure_args(self):
+        if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir):
+            yield config_args
+
+        else:
+            yield "--enable-shared=no"
+            yield "--enable-static=yes"
+            yield "--with-pic=yes"
+
     def _do_linux_compile(self):
-        self.run_configure("./configure", "--enable-shared=no", "--enable-static=yes", "--with-pic=yes")
+        self.run_configure("./configure", self.c_configure_args())
         self.run_make()
         self.run_make("install")
 
@@ -321,24 +369,28 @@ class Xz(ModuleBuilder):
 
     @property
     def url(self):
-        return f"https://downloads.sourceforge.net/project/lzmautils/xz-{self.version}.tar.gz"
+        return self.cfg_url(self.version) or f"https://downloads.sourceforge.net/project/lzmautils/xz-{self.version}.tar.gz"
 
     @property
     def version(self):
         return self.cfg_version("5.6.3")
 
+    def c_configure_args(self):
+        if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir):
+            yield config_args
+
+        else:
+            yield "--enable-shared=no"
+            yield "--enable-static=yes"
+            yield "--with-pic=yes"
+            yield "--disable-rpath"
+            yield "--disable-dependency-tracking"
+            yield "--disable-doc"
+            yield "--disable-nls"
+            yield "--without-libintl-prefix"
+
     def _do_linux_compile(self):
-        self.run_configure(
-            "./configure",
-            "--enable-shared=no",
-            "--enable-static=yes",
-            "--with-pic=yes",
-            "--disable-rpath",
-            "--disable-dependency-tracking",
-            "--disable-doc",
-            "--disable-nls",
-            "--without-libintl-prefix",
-        )
+        self.run_configure("./configure", self.c_configure_args())
         self.run_make()
         self.run_make("install")
 
@@ -360,13 +412,20 @@ class Zlib(ModuleBuilder):
 
     @property
     def url(self):
-        return f"https://zlib.net/fossils/zlib-{self.version}.tar.gz"
+        return self.cfg_url(self.version) or f"https://zlib.net/fossils/zlib-{self.version}.tar.gz"
 
     @property
     def version(self):
         return self.cfg_version("1.3.1")
 
+    def c_configure_args(self):
+        if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir):
+            yield config_args
+
+        else:
+            yield "--static"
+
     def _do_linux_compile(self):
-        self.run_configure("./configure", "--static")
+        self.run_configure("./configure", self.c_configure_args())
         self.run_make()
         self.run_make("install")

portable_python-1.9.6/src/portable_python/external/tkinter.py → portable_python-1.9.8/src/portable_python/external/xtkinter.py

@@ -53,7 +53,7 @@ class Tk(ModuleBuilder):
     def c_configure_args(self):
         yield "--enable-shared=no"
         yield "--enable-threads"
-        yield f"--with-tcl={self.deps_lib}"
+        yield f"--with-tcl={self.deps_lib_dir}"
         yield "--without-x"
         if PPG.target.is_macos:  # pragma: no cover, tcl/tk is "best effort"
             yield "--enable-aqua=yes"
@@ -89,8 +89,8 @@ class Tix(ModuleBuilder):
     def c_configure_args(self):
         yield "--enable-shared=no"
         yield "--enable-threads"
-        yield f"--with-tcl={self.deps_lib}"
-        yield f"--with-tk={self.deps_lib}"
+        yield f"--with-tcl={self.deps_lib_dir}"
+        yield f"--with-tk={self.deps_lib_dir}"
         yield "--without-x"
 
     def _do_linux_compile(self):

{portable_python-1.9.6 → portable_python-1.9.8/src/portable_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: portable-python
-Version: 1.9.6
+Version: 1.9.8
 Summary: Portable python binaries
 Home-page: https://github.com/codrsquad/portable-python
 Author: Zoran Simic
@@ -18,19 +18,18 @@ Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 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 :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: System :: Installation/Setup
 Classifier: Topic :: System :: Software Distribution
 Classifier: Topic :: Utilities
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: click~=8.0
@@ -38,6 +37,18 @@ Requires-Dist: pyyaml~=6.0
 Requires-Dist: requests<3.0
 Requires-Dist: runez~=5.0
 Requires-Dist: urllib3~=1.26
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 Portable python binaries
 ========================

{portable_python-1.9.6 → portable_python-1.9.8}/src/portable_python.egg-info/SOURCES.txt

@@ -22,8 +22,8 @@ src/portable_python.egg-info/requires.txt
 src/portable_python.egg-info/top_level.txt
 src/portable_python/external/__init__.py
 src/portable_python/external/_inspect.py
-src/portable_python/external/tkinter.py
 src/portable_python/external/xcpython.py
+src/portable_python/external/xtkinter.py
 tests/test_build.py
 tests/test_cleanup.py
 tests/test_failed.py

{portable_python-1.9.6 → portable_python-1.9.8}/tests/test_setup.py

@@ -11,7 +11,7 @@ def test_config(cli):
 
     cli.run("-ntmacos-arm64", "-c", cli.tests_path("sample-config1.yml"), "build", "3.9.7", "-mnone")
     assert cli.succeeded
-    assert " -mpip install my-additional-package" in cli.logged
+    assert " -mpip install --no-cache-dir --upgrade my-additional-package" in cli.logged
     assert "env MACOSX_DEPLOYMENT_TARGET=12" in cli.logged  # Comes from more specific macos-arm64.yml
     assert " -> dist/cpython-3.9.7-macos-arm64.tar.xz" in cli.logged  # Comes from macos.yml (not defined in macos-arm64.yml)
     cli.match("Would run: build/cpython-.../bin/python -mpip install -U wheel")