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

{portable_python-1.9.8 → portable_python-1.10.0}/DEVELOP.md

@@ -1,16 +1,11 @@
-# How to create a dev venv
+# Local development
 
-If you have tox, you can run: `tox -re venv`, that will get you a `.venv/`
-ready to go.
-
-If you don't have tox, you can run this (any python 3.6+ will do):
+Create a dev venv:
 
 ```shell
-rm -rf .venv
-/usr/bin/python3 -mvenv .venv
-.venv/bin/pip install -U pip
-.venv/bin/pip install -r requirements.txt -r tests/requirements.txt
-.venv/bin/pip install -e .
+uv venv
+uv pip install -r requirements.txt -r tests/requirements.txt
+uv pip install -e .
 ```
 
 You can then run `portable-python` from that venv:
@@ -24,10 +19,8 @@ You can then run `portable-python` from that venv:
 # Run the tests
 
 If you have tox, just run: `tox` to run all the tests. You can also run:
-- `tox -e py39` to run with just one python version
+- `tox -e py313` to run with just one python version
 - `tox -e style` to check PEP8 formatting
-- `tox -r` if you changed any `requirements.txt` (`-r` is short for `--recreate`)
-- `tox -re py39` to recreate and run `py39` only
 - etc
 
 If you don't have tox, you can run the tests with: `.venv/bin/pytest tests/`
@@ -49,7 +42,7 @@ You can easily run `portable-python` in a debugger.
 In PyCharm for example, you would simply browse to `.venv/bin/portable-python`
 then right-click and select "Debug portable-python".
 You can then edit the build/run configuration in PyCharm, add some "Parameters" to it,
-like for example `build-report 3.10.5`, and then set breakpoints wherever you like.
+like for example `build-report 3.13.2`, and then set breakpoints wherever you like.
 
 There is a `--dryrun` mode that can come in very handy for rapid iterations.
 
@@ -71,5 +64,5 @@ docker run -it -v./:/src/ portable-python-jammy /bin/bash
 Now inside docker, you run a build:
 
 ```shell
-portable-python build 3.11.4
+portable-python build 3.13.2
 ```

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: portable-python
-Version: 1.9.8
+Version: 1.10.0
 Summary: Portable python binaries
 Home-page: https://github.com/codrsquad/portable-python
 Author: Zoran Simic
@@ -18,7 +18,6 @@ Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -29,7 +28,7 @@ Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: System :: Installation/Setup
 Classifier: Topic :: System :: Software Distribution
 Classifier: Topic :: Utilities
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: click~=8.0
@@ -45,6 +44,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-dist
 Dynamic: requires-python

{portable_python-1.9.8 → portable_python-1.10.0}/pyproject.toml

@@ -63,7 +63,7 @@ ignore = [
 order-by-type = false
 
 [tool.ruff.lint.mccabe]
-max-complexity = 14
+max-complexity = 18
 
 [tool.ruff.lint.pydocstyle]
 convention = "numpy"

{portable_python-1.9.8 → portable_python-1.10.0}/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.8",
+    python_requires=">=3.9",
     entry_points={
         "console_scripts": [
             "portable-python = portable_python.__main__:main",
@@ -22,7 +22,6 @@ setup(
         "Operating System :: Unix",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",

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

@@ -492,10 +492,23 @@ class ModuleBuilder:
     def cfg_version(self, default):
         return PPG.config.get_value("%s-version" % self.m_name) or default
 
+    def cfg_http_headers(self):
+        if config_http_headers := PPG.config.get_value("%s-http-headers" % self.m_name):
+            expanded_http_headers = {}
+            for header_dict in config_http_headers:
+                for key, value in header_dict.items():
+                    expanded_http_headers[os.path.expandvars(key)] = os.path.expandvars(value)
+
+            return expanded_http_headers
+
     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)
+            url_subbed = url_template.substitute(version=version)
+            return os.path.expandvars(url_subbed)
+
+    def cfg_src_suffix(self):
+        return PPG.config.get_value("%s-src-suffix" % self.m_name)
 
     def cfg_configure(self, deps_lib_dir, deps_lib64_dir):
         if configure := PPG.config.get_value("%s-configure" % self.m_name):
@@ -510,6 +523,16 @@ class ModuleBuilder:
         """Url of source tarball, if any"""
         return ""
 
+    @property
+    def headers(self):
+        """Headers for connecting to source url, if any"""
+        return self.cfg_http_headers()
+
+    @property
+    def src_suffix(self):
+        """Suffix of src archive for when URL doesn't end in the file extension"""
+        return self.cfg_src_suffix()
+
     @property
     def version(self):
         """Version to use"""
@@ -632,8 +655,16 @@ class ModuleBuilder:
                         self._finalize()
                         return
 
+                # Some URL's may not end in file extension, such as with redirects.
+                # Github releases asset endpoint is this way .../releases/assets/48151
+
                 # Split on '#' for urls that include a checksum, such as #sha256=... fragment
                 basename = runez.basename(self.url, extension_marker="#")
+                if not basename.endswith((".zip", ".tar.gz")):
+                    suffix = self.src_suffix or ".tar.gz"
+                    suffix = ".%s" % (suffix.strip("."))  # Ensure it starts with a dot (in case config forgot leading dot)
+                    basename = f"{self.m_name}-{self.version}{suffix}"
+
                 path = self.setup.folders.sources / basename
                 if not path.exists():
                     proxies = {}
@@ -643,11 +674,22 @@ class ModuleBuilder:
                     https_proxy = os.environ.get("HTTPS_PROXY") or os.environ.get("https_proxy")
                     if https_proxy:
                         proxies["https"] = https_proxy
-                    RestClient().download(self.url, path, proxies=proxies)
+
+                    RestClient().download(self.url, path, proxies=proxies, headers=self.headers)
 
                 runez.decompress(path, self.m_src_build, simplify=True)
 
                 env_vars = self._get_env_vars()
+                if not PPG.config.get_value("allow-homebrew"):
+                    # Remove any mention of /opt/homebrew from PATH (reduce chances of dynamic links to homebrew)
+                    path_env_var = env_vars.get("PATH")
+                    if path_env_var:
+                        _paths = os.environ.get("PATH", "").split(":")
+                        _revised = [p for p in _paths if not p.startswith("/opt/homebrew")]
+                        if _revised != _paths:
+                            LOG.info("Removed /opt/homebrew mentions from PATH")
+                            env_vars["PATH"] = runez.joined(_revised, delimiter=":")
+
                 prev_env_vars = {}
                 for var_name, value in env_vars.items():
                     LOG.info("env %s=%s", var_name, runez.short(value, size=2048))

{portable_python-1.9.8 → portable_python-1.10.0}/src/portable_python/external/__init__.py

@@ -6,7 +6,7 @@ class GettextTiny(ModuleBuilder):
 
     @property
     def url(self):
-        return f"https://github.com/sabotage-linux/gettext-tiny/archive/refs/tags/v{self.version}.tar.gz"
+        return self.cfg_url(self.version) or f"https://github.com/sabotage-linux/gettext-tiny/archive/refs/tags/v{self.version}.tar.gz"
 
     @property
     def version(self):

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

@@ -80,11 +80,11 @@ class Gdbm(ModuleBuilder):
 
     @property
     def url(self):
-        return self.cfg_url(self.version) or f"https://ftp.gnu.org/gnu/gdbm/gdbm-{self.version}.tar.gz"
+        return self.cfg_url(self.version) or f"https://ftpmirror.gnu.org/gnu/gdbm/gdbm-{self.version}.tar.gz"
 
     @property
     def version(self):
-        return self.cfg_version("1.24")
+        return self.cfg_version("1.26")
 
     def c_configure_args(self):
         if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir):
@@ -129,7 +129,7 @@ class LibFFI(ModuleBuilder):
 
     @property
     def version(self):
-        return self.cfg_version("3.4.6")
+        return self.cfg_version("3.4.8")
 
     def c_configure_args(self):
         if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir):
@@ -176,7 +176,7 @@ class Openssl(ModuleBuilder):
     def version(self):
         # See https://endoflife.date/openssl
         # This default here picks the most conservative longest supported version
-        return self.cfg_version("3.0.15")
+        return self.cfg_version("3.0.17")
 
     def c_configure_args(self):
         if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir):
@@ -258,7 +258,7 @@ class Readline(ModuleBuilder):
 
     @property
     def url(self):
-        return self.cfg_url(self.version) or f"https://ftp.gnu.org/gnu/readline/readline-{self.version}.tar.gz"
+        return self.cfg_url(self.version) or f"http://ftpmirror.gnu.org/gnu/readline/readline-{self.version}.tar.gz"
 
     @property
     def version(self):
@@ -306,7 +306,7 @@ class Sqlite(ModuleBuilder):
 
     @property
     def version(self):
-        return self.cfg_version("3.47.0")
+        return self.cfg_version("3.50.4")
 
     def c_configure_args(self):
         if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir):
@@ -373,7 +373,7 @@ class Xz(ModuleBuilder):
 
     @property
     def version(self):
-        return self.cfg_version("5.6.3")
+        return self.cfg_version("5.8.1")
 
     def c_configure_args(self):
         if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir):

{portable_python-1.9.8 → portable_python-1.10.0}/src/portable_python/versions.py

@@ -74,7 +74,7 @@ class VersionFamily:
 class CPythonFamily(VersionFamily):
     """Implementation for cpython"""
 
-    min_version = "3.7"  # Earliest non-EOL known to compile well
+    min_version = "3.9"  # Earliest non-EOL known to compile well
 
     @runez.cached_property
     def client(self):

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: portable-python
-Version: 1.9.8
+Version: 1.10.0
 Summary: Portable python binaries
 Home-page: https://github.com/codrsquad/portable-python
 Author: Zoran Simic
@@ -18,7 +18,6 @@ Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -29,7 +28,7 @@ Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: System :: Installation/Setup
 Classifier: Topic :: System :: Software Distribution
 Classifier: Topic :: Utilities
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: click~=8.0
@@ -45,6 +44,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-dist
 Dynamic: requires-python

{portable_python-1.9.8 → portable_python-1.10.0}/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.6.3: ForbiddenHttpError" in cli.logged
+    assert "Error while compiling xz:5.8.1: ForbiddenHttpError" in cli.logged
     assert "Overall compilation failed:" in cli.logged
 
 

{portable_python-1.9.8 → portable_python-1.10.0}/tests/test_list.py

@@ -7,7 +7,7 @@ REST_CLIENT = RestClient()
 GH_CPYTHON_SAMPLE = """
 [
 {"ref": "refs/tags/v3.9.7"},
-{"ref": "refs/tags/v3.8.12"},
+{"ref": "refs/tags/v3.13.3"},
 {"ref": "refs/tags/v3.5.10"}
 ]
 """
@@ -15,7 +15,7 @@ GH_CPYTHON_SAMPLE = """
 PYTHON_ORG_SAMPLE = """
 <a href="3.9.5/">3.9.5/</a>
 <a href="3.9.6/">3.9.6/</a>
-<a href="3.8.11/">3.9.11/</a>
+<a href="3.13.2/">3.13.2/</a>
 <a href="3.5.10/">3.5.10/</a>
 """
 
@@ -34,12 +34,12 @@ def test_list(cli, monkeypatch):
     assert setup.python_spec.version == PPG.cpython.latest
 
     cp = CPythonFamily()
-    assert str(cp.latest) == "3.9.6"
+    assert str(cp.latest) == "3.13.2"
 
     monkeypatch.setattr(PPG.cpython, "_versions", None)
     cli.run("list")
     assert cli.succeeded
-    assert cli.logged.stdout.contents().strip() == "cpython:\n  3.9: 3.9.6\n  3.8: 3.8.11"
+    assert cli.logged.stdout.contents().strip() == "cpython:\n  3.13: 3.13.2\n  3.9: 3.9.6"
 
     cli.run("list", "--json")
     assert cli.succeeded
@@ -52,4 +52,4 @@ def test_list(cli, monkeypatch):
     monkeypatch.setattr(PPG.cpython, "_versions", None)
     cli.run("-c", cli.tests_path("sample-config1.yml"), "list")
     assert cli.succeeded
-    assert cli.logged.stdout.contents().strip() == "cpython:\n  3.9: 3.9.7\n  3.8: 3.8.12"
+    assert cli.logged.stdout.contents().strip() == "cpython:\n  3.13: 3.13.3\n  3.9: 3.9.7"

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

@@ -9,8 +9,15 @@ def test_config(cli):
     with pytest.raises(runez.system.AbortException):
         PPG.config.parsed_yaml("a: b\ninvalid line", "testing")
 
+    # Exercise custom url in config
+    cli.run("-ntmacos-arm64", "-c", cli.tests_path("sample-config1.yml"), "build", "3.9.7", "-mbzip2")
+    assert cli.succeeded
+    assert "Would download https://my-enterprise/.../assets/bzip2/123#sha256=123...def\n" in cli.logged
+    assert "Would untar build/sources/bzip2-1.2.3.tar.gz -> build/components/bzip2\n" in cli.logged
+
     cli.run("-ntmacos-arm64", "-c", cli.tests_path("sample-config1.yml"), "build", "3.9.7", "-mnone")
     assert cli.succeeded
+
     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)