portable-python 1.8.7__tar.gz → 1.9.1__tar.gz

{portable-python-1.8.7/src/portable_python.egg-info → portable-python-1.9.1}/PKG-INFO

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

{portable-python-1.8.7 → portable-python-1.9.1}/src/portable_python/config.py

@@ -67,7 +67,6 @@ windows:
   ext: zip
 
 macos:
-  allowed-system-libs: .*  # System libs on macos are OK (such as bz2 etc)
   env:
     MACOSX_DEPLOYMENT_TARGET: 13  # Ventura, released June 2022
 """

{portable-python-1.8.7 → portable-python-1.9.1}/src/portable_python/external/xcpython.py

@@ -316,7 +316,7 @@ class Xz(ModuleBuilder):
 
     @property
     def url(self):
-        return f"https://github.com/tukaani-project/xz/releases/download/v{self.version}/xz-{self.version}.tar.gz"
+        return f"https://downloads.sourceforge.net/project/lzmautils/xz-{self.version}.tar.gz"
 
     @property
     def version(self):

{portable-python-1.8.7 → portable-python-1.9.1}/src/portable_python/inspector.py

@@ -567,11 +567,12 @@ class FullSoReport:
 
     def get_problem(self, portable) -> str:
         if portable:
-            uses_system = [x.relative_path for x in self.lib_tracker.category[LibType.system].items]
-            if uses_system:
-                allowed = PPG.config.get_value("allowed-system-libs")
-                if allowed:
-                    allowed = re.compile(allowed)
+            allowed = PPG.config.get_value("allowed-system-libs")
+            if allowed:
+                # allowed-system-libs needs to be defined for the check to occur (opt-in)
+                allowed = re.compile(allowed)
+                uses_system = [x.relative_path for x in self.lib_tracker.category[LibType.system].items]
+                if uses_system:
                     uses_system = [x for x in uses_system if not allowed.match(x)]
 
                 if uses_system:

{portable-python-1.8.7 → portable-python-1.9.1/src/portable_python.egg-info}/PKG-INFO

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

{portable-python-1.8.7 → portable-python-1.9.1}/tests/test_inspector.py

@@ -21,7 +21,7 @@ def test_find_libs(temp_folder):
     assert x == ["lib-foo.a", "lp.dylib", "lp.so", "lp.so.1.0", "python3.9/config-3.9/libpython3.9.so"]
 
 
-def test_inspect_python(temp_folder):
+def test_inspect_python(temp_folder, monkeypatch):
     PPG.grab_config("foo.yml")
     inspector = PythonInspector("invoker")
     assert str(inspector)
@@ -41,7 +41,9 @@ def test_inspect_python(temp_folder):
 
     # Verify using system libs on linux is considered a fail
     PPG.grab_config(target="linux-x86_64")
-    assert str(r.get_problem(True)).startswith("Uses system libs:")
+    monkeypatch.setitem(PPG.config.default.data, "linux", {"allowed-system-libs": "/foo"})
+    problem = r.get_problem(True)
+    assert problem.startswith("Uses system libs:")
 
 
 OTOOL_SAMPLE = """

{portable-python-1.8.7 → portable-python-1.9.1}/src/portable_python/cpython.py

@@ -211,12 +211,6 @@ class Cpython(PythonBuilder):
             lib_auto_correct = LibAutoCorrect(self.c_configure_prefix, self.install_folder, ppp_marker=self.setup.folders.ppp_marker)
             lib_auto_correct.run()
 
-        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)
-        if not self.setup.prefix:
-            self._relativize_sysconfig()
-            self._relativize_shebangs()
-
         PPG.config.cleanup_configured_globs("Pass 1", self, "cpython-clean-1st-pass")
         PPG.config.symlink_duplicates(self.install_folder)
         validation_script = PPG.config.resolved_path("cpython-validate-script")
@@ -236,6 +230,12 @@ class Cpython(PythonBuilder):
 
             self.run_python("-mpip", "install", *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)
+        if not self.setup.prefix:
+            self._relativize_sysconfig()
+            self._relativize_shebangs()
+
         self._validate_venv_module()
         if PPG.config.get_value("cpython-compile-all"):
             self.run_python("-mcompileall", "-q", self.install_folder / "lib")