portable-python 1.8.1__tar.gz → 1.8.3__tar.gz

{portable-python-1.8.1/src/portable_python.egg-info → portable-python-1.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portable-python
-Version: 1.8.1
+Version: 1.8.3
 Summary: Portable python binaries
 Home-page: https://github.com/codrsquad/portable-python
 Author: Zoran Simic

{portable-python-1.8.1 → portable-python-1.8.3}/src/portable_python/__init__.py

@@ -520,7 +520,8 @@ class ModuleBuilder:
             yield f"{self.deps_lib}/pkgconfig"
 
     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)
+        logger = self._log_handler
+        return runez.run(program, *args, passthrough=logger, stdout=None, stderr=None, fatal=fatal, env=env, logger=logger or runez.UNSET)
 
     def run_configure(self, program, *args, prefix=None):
         """
@@ -562,6 +563,10 @@ class ModuleBuilder:
 
             yield
 
+        except Exception as e:
+            LOG.error("Error while compiling %r: %r", self, e)
+            raise
+
         finally:
             if self._log_handler:
                 logging.root.removeHandler(self._log_handler)

{portable-python-1.8.1 → portable-python-1.8.3}/src/portable_python/config.py

@@ -29,14 +29,13 @@ ext: gz
 
 # Pre -mcompileall, cleanup tests and useless files (~94 MB)
 cpython-clean-1st-pass:
-  - __phello__.foo.py
   - __pycache__/
   - _test*capi.*
   - idle_test/
   - test/
   - tests/
   # By default, simplify bin/ folder
-  - bin/2to3* bin/easy_install* bin/idle3* bin/pydoc* bin/pyvenv* bin/wheel*
+  - bin/2to3* bin/easy_install* bin/idle3*
 
 # wininst-* is probably an old goof (~2 MB of .exe binaries)
 cpython-clean-1st-pass-linux: wininst-*
@@ -231,6 +230,7 @@ class Config:
             _find_file_duplicates(seen, folder)
             duplicates = {k: v for k, v in seen.items() if len(v) > 1}
             for dupes in duplicates.values():
+                LOG.info("Found duplicates: %s" % runez.joined(dupes, delimiter=", "))
                 dupes = sorted(dupes, key=lambda x: len(str(x)))
                 if len(dupes) == 2:
                     shorter, longer = dupes

{portable-python-1.8.1 → portable-python-1.8.3}/src/portable_python/cpython.py

@@ -162,10 +162,6 @@ class Cpython(PythonBuilder):
 
         PPG.config.cleanup_folder(self, "cpython-clean-1st-pass")
         PPG.config.symlink_duplicates(self.install_folder)
-        py_inspector = PythonInspector(self.install_folder)
-        print(py_inspector.represented())
-        problem = py_inspector.full_so_report.get_problem(portable=not is_shared)
-        runez.abort_if(problem and self.setup.x_debug != "direct-finalize", "Build failed: %s" % problem)
         validation_script = PPG.config.resolved_path("cpython-validate-script")
         if validation_script:
             LOG.info("Exercising configured validation script: %s" % runez.short(validation_script))
@@ -173,6 +169,14 @@ class Cpython(PythonBuilder):
 
         additional = PPG.config.get_value("cpython-additional-packages")
         if additional:
+            # Config wants additional packages installed, ensure that `pip` is installed first
+            if "--with-ensurepip=no" not in self.c_configure_args_from_config:
+                cmd = ["-mensurepip"]
+                if "--with-ensurepip=install" not in self.c_configure_args_from_config:
+                    cmd.append("--upgrade")
+
+                self.run_python(cmd)
+
             self.run_python("-mpip", "install", *runez.flattened(additional))
 
         check_venvs = PPG.config.get_value("cpython-check-venvs")
@@ -186,6 +190,14 @@ class Cpython(PythonBuilder):
         if PPG.config.get_value("cpython-compile-all"):
             self.run_python("-mcompileall", "-q", self.install_folder / "lib")
 
+        if self.config_folder:
+            # When --enable-shared is specified, cpython build does not produce 'lib/libpython*.a'
+            # Add it if build was not configured to clean up 'self.config_folder'
+            actual_static = self.config_folder / f"libpython{self.version.mm}.a"
+            symlink_static = self.install_folder / f"lib/libpython{self.version.mm}.a"
+            if actual_static.exists() and not symlink_static.exists():
+                runez.symlink(actual_static, symlink_static)
+
         info_path = PPG.config.get_value("manifest", "build-info")
         if info_path:
             contents = self._represented_yaml(self.build_information())
@@ -200,6 +212,11 @@ class Cpython(PythonBuilder):
 
         PPG.config.cleanup_folder(self, "cpython-clean-2nd-pass", "cpython-clean")
 
+        py_inspector = PythonInspector(self.install_folder)
+        print(py_inspector.represented())
+        problem = py_inspector.full_so_report.get_problem(portable=not is_shared)
+        runez.abort_if(problem and self.setup.x_debug != "direct-finalize", "Build failed: %s" % problem)
+
     def _check_venv(self, copies=False):
         """Verify that the freshly compiled python can create venvs without issue"""
         folder = "venv"
@@ -210,7 +227,7 @@ class Cpython(PythonBuilder):
 
         folder = self.setup.folders.build_folder / "test-venvs" / folder
         self.run_python(*args, folder)
-        self.run_python("-mpip", "--version")
+        self._do_run(folder / "bin/pip", "--version")
 
     @staticmethod
     def _represented_yaml(bits):
@@ -272,6 +289,7 @@ class Cpython(PythonBuilder):
                         rel_location = os.path.relpath(self.bin_python, path.parent)
                         lines.append("#!/bin/sh\n")
                         lines.append('"exec" "$(dirname $0)/%s" "$0" "$@"\n' % rel_location)
+                        lines.append("# -*- coding: utf-8 -*-\n")
 
             except UnicodeError:
                 return

{portable-python-1.8.1 → portable-python-1.8.3/src/portable_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portable-python
-Version: 1.8.1
+Version: 1.8.3
 Summary: Portable python binaries
 Home-page: https://github.com/codrsquad/portable-python
 Author: Zoran Simic

{portable-python-1.8.1 → portable-python-1.8.3}/tests/test_build.py

@@ -72,7 +72,7 @@ def test_finalization(cli, monkeypatch):
         manifest = list(runez.readlines(f"build/ppp-marker/{f.version}/.manifest.yml"))
         assert "  some_env: some-env-value" in manifest
         assert "selected: bzip2" in cli.logged
-        assert "INFO Cleaned 2 build artifacts (0 B): __phello__.foo.py idle_test" in cli.logged
+        assert "INFO Cleaned 1 build artifact (0 B): idle_test" in cli.logged
         assert f"Symlink {bin}/foo-python <- {bin}/python" in cli.logged
         assert f"Symlink {bin}/pip{f.mm} <- {bin}/pip" in cli.logged
         assert f"Auto-corrected shebang for {bin}/some-exe" in cli.logged
@@ -80,7 +80,8 @@ def test_finalization(cli, monkeypatch):
     transformed = "\n".join(runez.readlines(sys_cfg))
     assert transformed.strip() == SAMPLE_SYS_CONF_REL.strip()
 
-    assert list(runez.readlines(bin / "some-exe")) == ["#!/bin/sh", '"exec" "$(dirname $0)/foo-python" "$0" "$@"', "hello"]
+    expected = ["#!/bin/sh", '"exec" "$(dirname $0)/foo-python" "$0" "$@"', "# -*- coding: utf-8 -*-", "hello"]
+    assert list(runez.readlines(bin / "some-exe")) == expected
     assert list(runez.readlines(bin / "some-exe2")) == ["#!/bin/sh", "hello"]
     assert runez.basename(bin / "python", follow=True) == "foo-python"
 

{portable-python-1.8.1 → portable-python-1.8.3}/tests/test_failed.py

@@ -4,6 +4,13 @@ def test_build_bogus_platform(cli):
     assert "Compiling on platform 'foo' is not yet supported" in cli.logged
 
 
+def test_failed_build(cli):
+    cli.run("-tmacos-arm64", "build", "3.12.0")
+    assert cli.failed
+    assert "Error while compiling xz:5.4.5: ForbiddenHttpError" in cli.logged
+    assert "Overall compilation failed:" in cli.logged
+
+
 def test_invalid(cli):
     cli.run("-n", "build", "foo")
     assert cli.failed