portable-python 1.9.5__tar.gz → 1.9.7__tar.gz

{portable_python-1.9.5/src/portable_python.egg-info → portable_python-1.9.7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: portable-python
-Version: 1.9.5
+Version: 1.9.7
 Summary: Portable python binaries
 Home-page: https://github.com/codrsquad/portable-python
 Author: Zoran Simic
@@ -38,6 +38,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.5 → portable_python-1.9.7}/src/portable_python/__init__.py

@@ -539,8 +539,7 @@ class ModuleBuilder:
             yield f"{self.deps_lib}/pkgconfig"
 
     def _do_run(self, program, *args, fatal=True, env=None):
-        logger = self._log_handler
-        return runez.run(program, *args, passthrough=logger, stdout=None, stderr=None, fatal=fatal, env=env, logger=logger or runez.UNSET)
+        return runez.run(program, *args, passthrough=self._log_handler, stdout=None, stderr=None, fatal=fatal, env=env)
 
     def run_configure(self, program, *args, prefix=None):
         """
@@ -558,11 +557,13 @@ class ModuleBuilder:
 
     def run_make(self, *args, program="make", cpu_count=None):
         cmd = program.split()
-        if cpu_count is None:
-            cpu_count = multiprocessing.cpu_count()
+        if cpu_count and cpu_count < 0:
+            available = multiprocessing.cpu_count()
+            if available and available > 0:
+                cpu_count += available
 
-        if cpu_count and cpu_count > 3:
-            cmd.append("-j%s" % (cpu_count - 2))
+        if cpu_count and cpu_count > 1:
+            cmd.append("-j%s" % cpu_count)
 
         self._do_run(*cmd, *args)
 

{portable_python-1.9.5 → portable_python-1.9.7}/src/portable_python/cli.py

@@ -14,19 +14,21 @@ LOG = logging.getLogger(__name__)
 @runez.click.group()
 @runez.click.version()
 @runez.click.color()
-@runez.click.debug("-v")
 @runez.click.dryrun("-n")
 @click.option("--config", "-c", metavar="PATH", default="portable-python.yml", show_default=True, help="Path to config file to use")
+@click.option("--quiet", "-q", is_flag=True, help="Turn off DEBUG logging")
 @click.option("--target", "-t", hidden=True, help="For internal use / testing")
-def main(debug, config, target):
+def main(config, quiet, target):
     """
     Build (optionally portable) python binaries
     """
+    level = logging.INFO if quiet else logging.DEBUG
     runez.system.AbortException = SystemExit
     runez.log.setup(
-        debug=debug,
+        debug=not quiet,
+        level=level,
         console_format="%(levelname)s %(message)s",
-        console_level=logging.INFO,
+        console_level=level,
         default_logger=LOG.info,
         locations=None,
     )

{portable_python-1.9.5 → portable_python-1.9.7}/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
@@ -204,7 +204,7 @@ class Cpython(PythonBuilder):
 
         self.run_make(*make_args)
         # Don't parallelize `make install`, see https://github.com/python/cpython/issues/109796
-        self.run_make("install", f"DESTDIR={self.destdir}", cpu_count=0)
+        self.run_make("install", f"DESTDIR={self.destdir}")
 
     def _finalize(self):
         is_shared = self.setup.prefix or self.has_configure_opt("--enable-shared", "yes")
@@ -229,7 +229,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.5 → portable_python-1.9.7}/src/portable_python/external/__init__.py

@@ -13,8 +13,8 @@ class GettextTiny(ModuleBuilder):
         return self.cfg_version("0.3.2")
 
     def _do_linux_compile(self):
-        self.run_make("LIBINTL=NOOP", cpu_count=0)
-        self.run_make("LIBINTL=NOOP", f"DESTDIR={self.deps}", "prefix=/", "install", cpu_count=0)
+        self.run_make("LIBINTL=NOOP")
+        self.run_make("LIBINTL=NOOP", f"DESTDIR={self.deps}", "prefix=/", "install")
 
 
 class Toolchain(ModuleBuilder):

{portable_python-1.9.5 → portable_python-1.9.7}/src/portable_python/external/xcpython.py

@@ -74,7 +74,7 @@ class Gdbm(ModuleBuilder):
 
     @property
     def version(self):
-        return self.cfg_version("1.23")
+        return self.cfg_version("1.24")
 
     def _do_linux_compile(self):
         self.run_configure(
@@ -114,7 +114,7 @@ class LibFFI(ModuleBuilder):
 
     @property
     def version(self):
-        return self.cfg_version("3.4.4")
+        return self.cfg_version("3.4.6")
 
     def _do_linux_compile(self):
         self.run_configure(
@@ -178,7 +178,7 @@ class Ncurses(ModuleBuilder):
 
     @property
     def version(self):
-        return self.cfg_version("6.4")
+        return self.cfg_version("6.5")
 
     def c_configure_args(self):
         yield "--disable-shared"
@@ -231,7 +231,7 @@ class Readline(ModuleBuilder):
 
     @property
     def version(self):
-        return self.cfg_version("8.2")
+        return self.cfg_version("8.2.13")
 
     def _do_linux_compile(self):
         self.run_configure(
@@ -244,8 +244,8 @@ class Readline(ModuleBuilder):
             "--disable-docs",
             "--enable-portable-binary",
         )
-        self.run_make(cpu_count=0)
-        self.run_make("install", cpu_count=0)
+        self.run_make()
+        self.run_make("install")
 
 
 class Sqlite(ModuleBuilder):
@@ -271,7 +271,7 @@ class Sqlite(ModuleBuilder):
 
     @property
     def version(self):
-        return self.cfg_version("3.45.1")
+        return self.cfg_version("3.47.0")
 
     def _do_linux_compile(self):
         self.run_configure(
@@ -325,7 +325,7 @@ class Xz(ModuleBuilder):
 
     @property
     def version(self):
-        return self.cfg_version("5.4.6")
+        return self.cfg_version("5.6.3")
 
     def _do_linux_compile(self):
         self.run_configure(

portable_python-1.9.5/src/portable_python/external/tkinter.py → portable_python-1.9.7/src/portable_python/external/xtkinter.py

@@ -116,4 +116,4 @@ class TkInter(ModuleBuilder):
 
     @property
     def version(self):
-        return self.cfg_version("8.6.10")
+        return self.cfg_version("8.6.15")

{portable_python-1.9.5 → portable_python-1.9.7/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.5
+Version: 1.9.7
 Summary: Portable python binaries
 Home-page: https://github.com/codrsquad/portable-python
 Author: Zoran Simic
@@ -38,6 +38,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.5 → portable_python-1.9.7}/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.5 → portable_python-1.9.7}/tests/test_failed.py

@@ -7,7 +7,7 @@ def test_build_bogus_platform(cli):
 def test_failed_build(cli):
     cli.run("-tmacos-arm64", "build", "3.12.0")
     assert cli.failed
-    assert "Error while compiling xz:5.4.6: ForbiddenHttpError" in cli.logged
+    assert "Error while compiling xz:5.6.3: ForbiddenHttpError" in cli.logged
     assert "Overall compilation failed:" in cli.logged
 
 

{portable_python-1.9.5 → portable_python-1.9.7}/tests/test_invoker.py

@@ -3,7 +3,7 @@ import sys
 
 
 def test_invoker(cli):
-    cli.run("-v", "inspect", "invoker", "-v", "-mall")
+    cli.run("inspect", "invoker", "-v", "-mall")
 
     # Invoker may not be completely clean, but it has to have at least one OK .so usage
     m = re.search(r"^\.so files: .+, (\d+) OK", cli.logged.stdout.contents(), re.MULTILINE)

{portable_python-1.9.5 → portable_python-1.9.7}/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")