portable-python 1.8.4__tar.gz → 1.8.5__tar.gz

{portable-python-1.8.4/src/portable_python.egg-info → portable-python-1.8.5}/PKG-INFO

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

portable-python-1.8.5/pyproject.toml

@@ -0,0 +1,76 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+
+[tool.ruff]
+cache-dir = ".tox/.ruff_cache"
+line-length = 140
+src = ["src", "tests"]
+
+[tool.ruff.lint]
+extend-select = [
+    "A",   # flake8-builtins
+#    "ARG", # flake8-unused-arguments
+    "B",   # flake8-bugbear
+    "C4",  # flake8-comprehensions
+    "C90", # mccabe
+    "D",   # pydocstyle
+    "DTZ", # flake8-datetimez
+    "E",   # pycodestyle errors
+    "EM",  # flake8-errmsg
+    "ERA", # eradicate
+    "EXE", # flake8-executable
+    "F",   # pyflakes
+    "FLY", # flynt
+    "G",   # flake8-logging-format
+    "I",   # isort
+    "INT", # flake8-gettext
+    "PGH", # pygrep-hooks
+    "PIE", # flake8-pie
+    "PT", # flake8-pytest
+    "PYI", # flake8-pyi
+    "Q",   # flake8-quotes
+    "RSE", # flake8-raise
+    "RET", # flake8-return
+    "RUF", # ruff-specific
+    "S",   # flake8-bandit
+#    "SIM", # flake8-simplify
+    "SLF", # flake8-self
+    "SLOT", # flake8-slots
+    "T10", # flake8-debugger
+    "TID", # flake8-tidy-imports
+    "TCH", # flake8-type-checking
+#    "TD", # flake8-todos
+    "TRY", # tryceratops
+    "W",   # pycodestyle warnings
+]
+ignore = [
+    # TODO: gradually remove these (document all the things)
+    "D100",  # Missing docstring in public module
+    "D101",  # Missing docstring in public class
+    "D102",  # Missing docstring in public method
+    "D103",  # Missing docstring in public function
+    "D104",  # Missing docstring in public package
+    "D105",  # Missing docstring in magic method
+    "D200",  # One-line docstring should fit on one line with quotes
+    "D205",  # 1 blank line required between summary line and description
+    "D400",  # First line should end with a period
+    # Not useful:
+    "RET503",  # Missing explicit `return` at the end of function able to return non-`None` value
+]
+
+[tool.ruff.lint.flake8-builtins]
+builtins-ignorelist = ["bin", "compile"]
+
+[tool.ruff.lint.isort]
+order-by-type = false
+
+[tool.ruff.lint.mccabe]
+max-complexity = 14
+
+[tool.ruff.lint.pydocstyle]
+convention = "numpy"
+
+[tool.ruff.per-file-ignores]
+"tests/*" = [
+    "S",  # No security checks for tests
+]

{portable-python-1.8.4 → portable-python-1.8.5}/setup.py

@@ -1,6 +1,5 @@
 from setuptools import setup
 
-
 setup(
     name="portable-python",
     setup_requires="setupmeta",

{portable-python-1.8.4 → portable-python-1.8.5}/src/portable_python/__init__.py

@@ -15,7 +15,7 @@ import multiprocessing
 import os
 import pathlib
 import re
-from typing import List
+from typing import ClassVar, List
 
 import runez
 from runez.http import RestClient
@@ -24,7 +24,6 @@ from runez.render import Header, PrettyTable
 
 from portable_python.versions import PPG
 
-
 LOG = logging.getLogger(__name__)
 RX_BINARY = re.compile(r"^.*\.(dylib|gmo|icns|ico|nib|prof.*|tar)$")
 
@@ -36,11 +35,16 @@ def is_binary_file(path):
 def patch_folder(folder, regex, replacement, ignore=None):
     """Replace all occurrences of 'old_text' by 'new_text' in all files in 'folder'
 
-    Args:
-        folder (pathlib.Path): Folder to scan
-        regex: Regex to replace
-        replacement (str): Replacement text
-        ignore: Regex stating what to ignore
+    Parameters
+    ----------
+    folder : pathlib.Path
+        Folder to scan
+    regex : str
+        Regex to replace
+    replacement : str
+        Replacement text
+    ignore : re.Pattern | None
+        Regex stating what to ignore
     """
     for path in runez.ls_dir(folder):
         if not path.is_symlink() and (not ignore or not ignore.match(path.name)):
@@ -53,21 +57,21 @@ def patch_folder(folder, regex, replacement, ignore=None):
 
 def patch_file(path, regex, replacement):
     try:
-        with open(path, "rt") as fh:
+        with open(path) as fh:
             text = fh.read()
 
         new_text = re.sub(regex, replacement, text, flags=re.MULTILINE)
         if text != new_text:
-            with open(path, "wt") as fh:
+            with open(path, "w") as fh:
                 fh.write(new_text)
 
-            LOG.info("Patched '%s' in %s" % (regex, runez.short(path)))
+            LOG.info("Patched '%s' in %s", regex, runez.short(path))
 
     except Exception as e:
-        with open(path, "rt", errors="ignore") as fh:
+        with open(path, errors="ignore") as fh:
             text = fh.read()
             if re.search(regex, text):
-                LOG.warning("Can't patch '%s': %s" % (runez.short(path), e))
+                LOG.warning("Can't patch '%s': %s", runez.short(path), e)
 
 
 class FolderMask:
@@ -81,7 +85,7 @@ class FolderMask:
     """
 
     def __init__(self, target_folder):
-        LOG.info("Applying isolation hack/mask to %s" % target_folder)
+        LOG.info("Applying isolation hack/mask to %s", target_folder)
         self.target_folder = target_folder
         r = runez.run("hdiutil", "attach", "-nomount", "ram://2048", fatal=Exception)
         self.ram_disk = r.output.strip()
@@ -93,7 +97,7 @@ class FolderMask:
         self.mounted = True
 
     def cleanup(self):
-        LOG.info("Cleaning up isolation hack/mask for %s" % self.target_folder)
+        LOG.info("Cleaning up isolation hack/mask for %s", self.target_folder)
         if self.mounted:
             runez.run("umount", self.target_folder, fatal=False)
 
@@ -118,8 +122,12 @@ class BuildContext:
 
     def _resolved_isolation(self):
         """
-        Returns:
-            (str | None): What strategy to use to work around the fact that python's ./configure script looks at /usr/local
+        Isolation setting currently configured.
+
+        Returns
+        -------
+        str | None
+            What strategy to use to work around the fact that python's ./configure script looks at /usr/local
         """
         v = PPG.config.get_value("isolate-usr-local")
         if v == "auto":
@@ -182,7 +190,7 @@ class BuildContext:
 
 class BuildSetup:
     """
-    This class drives the compilation, external modules first, then the target python itself.
+    Drives the compilation, external modules first, then the target python itself.
     All modules are compiled in the same manner, follow the same conventional build layout.
     """
 
@@ -191,10 +199,14 @@ class BuildSetup:
 
     def __init__(self, python_spec=None, modules=None, prefix=None):
         """
-        Args:
-            python_spec (str | PythonSpec | None): Python to build (family and version)
-            modules (str | None): Modules to build (default: from config)
-            prefix (str | None): --prefix to use
+        Parameters
+        ----------
+        python_spec : str | PythonSpec | None
+            Python to build (family and version)
+        modules : str | None
+            Modules to build (default: from config)
+        prefix : str | None
+            --prefix to use
         """
         if not python_spec or python_spec == "latest":
             python_spec = PPG.cpython.latest
@@ -267,11 +279,11 @@ class BuildSetup:
         with BuildContext(self) as build_context:
             self.build_context = build_context
             modules = self.python_builder.modules
-            LOG.info("portable-python v%s, current folder: %s" % (runez.get_version(__name__), os.getcwd()))
+            LOG.info("portable-python v%s, current folder: %s", runez.get_version(__name__), os.getcwd())
             LOG.info(runez.joined(modules, list(modules)))
             LOG.info(PPG.config.config_files_report())
-            LOG.info("Platform: %s" % PPG.target)
-            LOG.info("Build report:\n%s" % self.python_builder.modules.report())
+            LOG.info("Platform: %s", PPG.target)
+            LOG.info("Build report:\n%s", self.python_builder.modules.report())
             self.validate_module_selection(fatal=not runez.DRYRUN and not self.x_debug)
             self.ensure_clean_folder(self.folders.components)
             self.ensure_clean_folder(self.folders.deps)
@@ -375,7 +387,6 @@ class ModuleCollection:
 
 
 class LinkerOutcome(enum.Enum):
-
     absent = "orange"
     failed = "red"
     shared = "blue"
@@ -389,6 +400,7 @@ class ModuleBuilder:
     m_build_cwd: str = None  # Optional: relative (to unpacked source) folder where to run configure/make from
     m_debian = None
     m_include: str = None  # Optional: subfolder to automatically list in CPATH when this module is active
+    m_telltale: ClassVar[list]  # Optional: list of files that, if present, indicate this module is installed
 
     setup: BuildSetup
     parent_module: "ModuleBuilder" = None
@@ -396,8 +408,10 @@ class ModuleBuilder:
 
     def __init__(self, parent_module):
         """
-        Args:
-            parent_module (BuildSetup | ModuleBuilder): Associated parent
+        Parameters
+        ----------
+        parent_module : BuildSetup | ModuleBuilder
+            Associated parent
         """
         self.m_name = ModuleCollection.get_module_name(self.__class__)
         if isinstance(parent_module, BuildSetup):
@@ -458,7 +472,7 @@ class ModuleBuilder:
         if self.resolved_telltale:
             return "has %s" % self.resolved_telltale
 
-        return "no %s" % getattr(self, "m_telltale")
+        return "no %s" % self.m_telltale
 
     def _find_telltale(self):
         telltales = getattr(self, "m_telltale", runez.UNSET)
@@ -525,8 +539,7 @@ class ModuleBuilder:
 
     def run_configure(self, program, *args, prefix=None):
         """
-        Calling ./configure is similar across all components.
-        This allows to have descendants customize each part relatively elegantly
+        Run ./configure script for this module.
         """
         if prefix is None:
             prefix = self.deps
@@ -564,7 +577,8 @@ class ModuleBuilder:
             yield
 
         except Exception as e:
-            LOG.error("Error while compiling %r: %r", self, e)
+            overview = repr(e)
+            LOG.exception("Error while compiling %s: %s", self, overview)
             raise
 
         finally:
@@ -598,7 +612,7 @@ class ModuleBuilder:
                 env_vars = self._get_env_vars()
                 prev_env_vars = {}
                 for var_name, value in env_vars.items():
-                    LOG.info("env %s=%s" % (var_name, runez.short(value, size=2048)))
+                    LOG.info("env %s=%s", var_name, runez.short(value, size=2048))
                     prev_env_vars[var_name] = os.environ.get(var_name)
                     os.environ[var_name] = value
 
@@ -672,7 +686,6 @@ class ModuleBuilder:
 
 
 class PythonBuilder(ModuleBuilder):
-
     _bin_python: pathlib.Path = None
 
     def __init__(self, parent_module):
@@ -692,8 +705,10 @@ class PythonBuilder(ModuleBuilder):
     @property
     def bin_python(self):
         """
-        Returns:
-            (pathlib.Path | None): Path to freshly compiled bin/python, real file (not symlink)
+        Returns
+        -------
+            pathlib.Path | None
+                Path to freshly compiled bin/python, real file (not symlink)
         """
         if self._bin_python is None:
             self._bin_python = PPG.config.find_main_file(self.bin_folder / "python", self.version)
@@ -724,5 +739,5 @@ class PythonBuilder(ModuleBuilder):
                 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)))
+                    LOG.info("Corrected permissions for %s (was %s)", runez.short(path), oct(current))
                     path.chmod(expected)

{portable-python-1.8.4 → portable-python-1.8.5}/src/portable_python/cli.py

@@ -8,7 +8,6 @@ from runez.render import PrettyTable
 from portable_python import BuildSetup, PPG
 from portable_python.inspector import LibAutoCorrect, PythonInspector
 
-
 LOG = logging.getLogger(__name__)
 
 
@@ -60,10 +59,6 @@ def build_report(modules, python_spec):
 def diagnostics():
     """Show diagnostics info"""
     with runez.Anchored("."):
-        def _diagnostics():
-            yield "invoker python", runez.SYS_INFO.invoker_python
-            yield from runez.SYS_INFO.diagnostics()
-
         config = PPG.config.represented()
         print(PrettyTable.two_column_diagnostics(_diagnostics(), config))
 
@@ -106,6 +101,11 @@ def list_cmd(json, family):
         print("  %s: %s" % (runez.bold(mm), v))
 
 
+def _diagnostics():
+    yield "invoker python", runez.SYS_INFO.invoker_python
+    yield from runez.SYS_INFO.diagnostics()
+
+
 def _find_recompress_source(folders, path):
     candidate = runez.to_path(path)
     if candidate.exists() or candidate.is_absolute():
@@ -158,7 +158,7 @@ def recompress(path, ext):
 
     \b
     Mildly useful for comparing sizes from different compressions
-    """
+    """  # noqa: D301
     extension = runez.SYS_INFO.platform_id.canonical_compress_extension(ext)
     pspec = PythonSpec.from_text(path)
     folders = PPG.get_folders(base=".", family=pspec and pspec.family, version=pspec and pspec.version)
@@ -203,6 +203,6 @@ def lib_auto_correct(commit, prefix, path):
 
 
 if __name__ == "__main__":
-    from portable_python.cli import main  # noqa, re-import with proper package
+    from portable_python.cli import main
 
     main()

{portable-python-1.8.4 → portable-python-1.8.5}/src/portable_python/config.py

@@ -9,7 +9,6 @@ import runez
 import yaml
 from runez.pyenv import Version
 
-
 LOG = logging.getLogger(__name__)
 
 DEFAULT_CONFIG = """
@@ -79,9 +78,12 @@ class Config:
 
     def __init__(self, paths=None, target=None):
         """
-        Args:
-            paths (str | list | None): Path(s) to config file(s)
-            target (str | runez.system.PlatformId | None): Target platform (for testing, defaults to current platform)
+        Parameters
+        ----------
+        paths : str | list | None
+            Path(s) to config file(s)
+        target : str | runez.system.PlatformId | None
+            Target platform (for testing, defaults to current platform)
         """
         self.paths = runez.flattened(paths, split=",")
         if not isinstance(target, runez.system.PlatformId):
@@ -98,17 +100,21 @@ class Config:
         return "%s [%s]" % (runez.plural(self._sources, "config source"), self.target)
 
     def completions(self, **given):
-        res = dict(arch=self.target.arch, platform=self.target.platform, subsystem=self.target.subsystem, target=str(self.target))
+        res = {"arch": self.target.arch, "platform": self.target.platform, "subsystem": self.target.subsystem, "target": str(self.target)}
         res.update(given)
         return res
 
     def get_value(self, *key, by_platform=True):
         """
-        Args:
-            key (str | tuple): Key to look up, tuple represents hierarchy, ie: a/b -> (a, b)
-            by_platform (bool): If True, value can be configured by platform
-
-        Returns:
+        Parameters
+        ----------
+        key : strzz | tuple
+            Key to look up, tuple represents hierarchy, ie: a/b -> (a, b)
+        by_platform : bool
+            If True, value can be configured by platform
+
+        Returns
+        -------
             Associated value, if any
         """
         value, _ = self.get_entry(*key, by_platform=by_platform)
@@ -116,18 +122,23 @@ class Config:
 
     def get_entry(self, *key, by_platform=True):
         """
-        Args:
-            key (str | tuple): Key to look up, tuple represents hierarchy, ie: a/b -> (a, b)
-            by_platform (bool): If True, value can be configured by platform
-
-        Returns:
-            Associated value, if any
+        Parameters
+        ----------
+        key : str | tuple
+            Key to look up, tuple represents hierarchy, ie: a/b -> (a, b)
+        by_platform : bool
+            If True, value can be configured by platform
+
+        Returns
+        -------
+        (str | int | float | bool | dict | list | None, ConfigSource | None)
+            Associated value (if any), together with the source that defined it
         """
         if by_platform:
             keys = (self.target.platform, self.target.arch, *key), (self.target.platform, *key), key
 
         else:
-            keys = (key, )
+            keys = (key,)
 
         for k in keys:
             for source in self._sources:
@@ -150,7 +161,7 @@ class Config:
         return value
 
     def config_files_report(self):
-        """One liner describing which config files are used, if any"""
+        """One-liner describing which config files are used, if any"""
         if len(self._sources) > 1:
             return "Config files: %s" % runez.joined(self._sources[:-1], delimiter=", ")
 
@@ -174,7 +185,7 @@ class Config:
     def delete(path):
         size = runez.filesize(path)
         runez.delete(path, logger=None)
-        LOG.info("Deleted %s (%s)" % (runez.short(path), runez.represented_bytesize(size)))
+        LOG.info("Deleted %s (%s)", runez.short(path), runez.represented_bytesize(size))
         return size
 
     @staticmethod
@@ -187,10 +198,14 @@ class Config:
 
     def cleanup_configured_globs(self, title, module, *keys):
         """
-        Args:
-            title (str): Title to use in log messages
-            module (portable_python.PythonBuilder): Associated python builder module
-            *keys (str): Config keys to lookup
+        Parameters
+        ----------
+        title : str
+            Title to use in log messages
+        module : portable_python.PythonBuilder
+            Associated python builder module
+        *keys : str
+            Config keys to lookup
         """
         globs = [(x, f"{x}-{self.target.platform}") for x in keys]
         globs = runez.flattened(globs, transform=self.get_value)
@@ -199,16 +214,20 @@ class Config:
 
     def cleanup_globs(self, title, module, *globs):
         """
-        Args:
-            title (str): Title to use in log messages
-            module (portable_python.PythonBuilder): Associated python builder module
-            *globs (str): Glob patterns to clean up
+        Parameters
+        ----------
+        title : str
+            Title to use in log messages
+        module : portable_python.PythonBuilder
+            Associated python builder module
+        *globs : str
+            Glob patterns to clean up
         """
         if globs:
             spec = [module.setup.folders.formatted(x) for x in globs]
             deleted_size = 0
             matcher = FileMatcher(spec)
-            LOG.info("Applying clean-up spec: %s" % matcher)
+            LOG.info("Applying clean-up spec: %s", matcher)
             cleaned = []
             for dirpath, dirnames, filenames in os.walk(module.install_folder):
                 removed = []
@@ -241,7 +260,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=", "))
+                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
@@ -261,14 +280,19 @@ class Config:
         return basename, "%s%s" % (basename, version.major), "%s%s" % (basename, version.mm)
 
     @staticmethod
-    def find_main_file(desired: pathlib.Path, version: Version):
+    def find_main_file(desired, version):
         """
-        Args:
-            desired: Desired path (base name considered if path not directly available)
-            version: Associated version
-
-        Returns:
-            (pathlib.Path | None): Path to associated real file (not symlink)
+        Parameters
+        ----------
+        desired : pathlib.Path
+            Desired path (base name considered if path not directly available)
+        version : Version
+            Associated version
+
+        Returns
+        -------
+        pathlib.Path | None
+            Path to associated real file (not symlink)
         """
         p = Config.real_path(desired)
         if p:
@@ -335,10 +359,14 @@ class ConfigSource:
 
     def get_value(self, key):
         """
-        Args:
-            key (str | tuple): Key to look up, tuple represents hierarchy, ie: a/b -> (a, b)
-
-        Returns:
+        Parameters
+        ----------
+        key : str | tuple
+            Key to look up, tuple represents hierarchy, ie: a/b -> (a, b)
+
+        Returns
+        -------
+        str | int | float | bool | dict | list | None
             Associated value, if any
         """
         return self._deep_get(self.data, key)
@@ -360,7 +388,6 @@ class ConfigSource:
 
 
 class FileMatcher:
-
     def __init__(self, clean_spec):
         self.matches = []
         for spec in clean_spec:
@@ -376,7 +403,6 @@ class FileMatcher:
 
 
 class SingleFileMatch:
-
     _on_folder = False
     _rx_basename = None
     _rx_path = None

{portable-python-1.8.4 → portable-python-1.8.5}/src/portable_python/cpython.py

@@ -12,7 +12,6 @@ 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.inspector import LibAutoCorrect, PythonInspector
 
-
 # https://github.com/docker-library/python/issues/160
 PGO_TESTS = """
 -m test.regrtest --pgo test_array test_base64 test_binascii test_binhex test_binop test_bytes test_c_locale_coercion
@@ -24,12 +23,17 @@ test_struct test_threading test_time test_traceback test_unicode
 
 def represented_yaml(key_value_pairs):
     """
-    Represented yaml for given key/value pairs
-    Args:
-        key_value_pairs (generator): Key/value pairs to represent
+    Yaml representation for given key/value pairs
+
+    Parameters
+    ----------
+    key_value_pairs : iterable
+        Key/value pairs to represent
 
-    Returns:
-        (str): Yaml representation
+    Returns
+    -------
+    str
+        Yaml representation
     """
     content = [yaml.safe_dump(runez.serialize.json_sanitized({x: y}), width=140) for x, y in key_value_pairs]
     return runez.joined(content, delimiter="\n")
@@ -46,28 +50,38 @@ class Cpython(PythonBuilder):
 
     def build_information(self):
         """
-        Yields key/value pairs to store as build information.
+        Build information to store in manifest.
         `None` or empty values are "naturally" omitted by the fact we use `runez.joined()` and `runez.flattened()`,
-         which have a default parameter `keep_empty=False`
+         which have a default parameter `keep_empty=False`.
+
+        Yields
+        ------
+        (str, dict)
         """
-        yield "cpython", {
-            "prefix": self.setup.prefix,
-            "source": self.url,
-            "static": runez.joined(self.modules.selected) or None,
-            "target": PPG.target,
-            "version": self.version,
-        }
+        yield (
+            "cpython",
+            {
+                "prefix": self.setup.prefix,
+                "source": self.url,
+                "static": runez.joined(self.modules.selected) or None,
+                "target": PPG.target,
+                "version": self.version,
+            },
+        )
         yield "configure-args", runez.joined(runez.short(x) for x in self.c_configure_args())
         compiled_by = os.environ.get("PP_ORIGIN") or PPG.config.get_value("compiled-by")
         bc = self.setup.build_context
-        yield "compilation-info", {
-            "compiled-by": compiled_by or "https://pypi.org/project/portable-python/",
-            "date": datetime.datetime.now(tz=datetime.timezone.utc).strftime("%Y-%m-%d %H:%M:%S %Z"),
-            "host-platform": runez.SYS_INFO.platform_info,
-            "ldd-version": PythonInspector.tool_version("ldd"),
-            "portable-python-version": runez.get_version(__package__),
-            "special-context": bc.isolate_usr_local and bc,
-        }
+        yield (
+            "compilation-info",
+            {
+                "compiled-by": compiled_by or "https://pypi.org/project/portable-python/",
+                "date": datetime.datetime.now(tz=datetime.timezone.utc).strftime("%Y-%m-%d %H:%M:%S %Z"),
+                "host-platform": runez.SYS_INFO.platform_info,
+                "ldd-version": PythonInspector.tool_version("ldd"),
+                "portable-python-version": runez.get_version(__package__),
+                "special-context": bc.isolate_usr_local and bc,
+            },
+        )
         additional = PPG.config.get_value("manifest", "additional-info")
         if additional:
             res = {}
@@ -174,7 +188,7 @@ class Cpython(PythonBuilder):
                 # Special edge case in macosx_sdk_specified() where /usr/local is fine...
                 x = "startswith({q}/usr/{q}) and not path.startswith({q}{p}{q})"
                 special_case = x.replace("(", r"\(").replace(")", r"\)").format(q="['\"]", p=self.deps)
-                restored = x.format(q="'", p='/usr/local')
+                restored = x.format(q="'", p="/usr/local")
                 patch_file(setup_py, special_case, restored)
 
             # Only doable on macOS: patch -install_name so produced exes/libs use a relative path
@@ -286,11 +300,7 @@ class Cpython(PythonBuilder):
         Autocorrect pkgconfig and sysconfig to use relative paths
         See https://manpages.debian.org/stretch/pkg-config/pkg-config.1.en.html#PKG-CONFIG_DERIVED_VARIABLES
         """
-        patch_folder(
-            self.install_folder / "lib/pkgconfig",
-            f"prefix={self.c_configure_prefix}",
-            "prefix=${pcfiledir}/../.."
-        )
+        patch_folder(self.install_folder / "lib/pkgconfig", f"prefix={self.c_configure_prefix}", "prefix=${pcfiledir}/../..")
         sys_cfg = self._find_sys_cfg()
         if sys_cfg:
             rs = RelSysConf(sys_cfg, self.c_configure_prefix)
@@ -347,7 +357,7 @@ class Cpython(PythonBuilder):
 
         if lines:
             LOG.info("Auto-corrected shebang for %s" % runez.short(path))
-            with open(path, "wt") as fh:
+            with open(path, "w") as fh:
                 for line in lines:
                     fh.write(line)
 
@@ -375,7 +385,7 @@ class RelSysConf:
     def _relativize(self, line):
         start = 0
         for m in self.rx_strings.finditer(line):
-            yield line[start:m.start(0)]
+            yield line[start : m.start(0)]
             start = m.end(0)
             content = m.group(2)
             if self.prefix in content:

{portable-python-1.8.4 → portable-python-1.8.5}/src/portable_python/external/_inspect.py

@@ -4,7 +4,6 @@ import re
 import sys
 import sysconfig
 
-
 RX_VERSION = re.compile(r"\d\.\d")
 INSIGHTS = {
     "_gdbm": "_GDBM_VERSION",
@@ -38,7 +37,7 @@ def get_version(text):
 def pymodule_version_info(key, value, pymodule):
     version = get_version(value)
     if version:
-        result = dict(version_field=key, version=version)
+        result = {"version_field": key, "version": version}
         if hasattr(pymodule, "__file__"):
             result["path"] = pymodule.__file__
 
@@ -54,14 +53,14 @@ def pymodule_info(module_name, pymodule):
             return v
 
     if hasattr(pymodule, "__file__"):
-        return dict(path=pymodule.__file__)
+        return {"path": pymodule.__file__}
 
     if hasattr(pymodule, "__spec__"):
-        v = getattr(pymodule.__spec__, "origin")
+        v = getattr(pymodule.__spec__, "origin", None)
         if v == "built-in":
-            return dict(version=v)
+            return {"version": v}
 
-    return dict(note=str(dir(pymodule)))
+    return {"note": str(dir(pymodule))}
 
 
 def module_report(module_name):
@@ -71,9 +70,9 @@ def module_report(module_name):
     except Exception as e:
         note = str(e)
         if "No module named" in note:
-            return dict(version="*absent*")
+            return {"version": "*absent*"}
 
-        return dict(version="*absent*", note=note)
+        return {"version": "*absent*", "note": note}
 
 
 def get_srcdir():
@@ -92,7 +91,7 @@ def get_simplified_dirs(path):
         if path.startswith("/private"):
             result.append(path[8:])  # whoever compiled didn't use realpath(tmp)
 
-        elif not path.startswith("/tmp"):  # nosec, just simplifying paths
+        elif not path.startswith("/tmp"):  # noqa: S108, just simplifying path representation
             result.append(os.path.dirname(result[0]))
 
     return result
@@ -121,8 +120,8 @@ def main(arg):
             names.remove("pip")
             names.append("pip")
 
-        report = dict((k, module_report(k)) for k in names)
-        report = dict(report=report, srcdir=get_srcdir(), prefix=sysconfig.get_config_var("prefix"))
+        report = dict((k, module_report(k)) for k in names)  # noqa: C402, works on py2 as well (can inspect py2)
+        report = {"report": report, "srcdir": get_srcdir(), "prefix": sysconfig.get_config_var("prefix")}
         print(json.dumps(report, indent=2, sort_keys=True))
 
 

{portable-python-1.8.4 → portable-python-1.8.5}/src/portable_python/external/tkinter.py

@@ -5,6 +5,8 @@ It is also unclear what version to use, which build docs to follow etc.
 Contributions are welcome!
 """
 
+from typing import ClassVar
+
 import runez
 
 from portable_python import ModuleBuilder, PPG
@@ -37,7 +39,6 @@ class Tcl(ModuleBuilder):
 
 
 class Tk(ModuleBuilder):
-
     m_build_cwd = "unix"
 
     @property
@@ -107,7 +108,7 @@ class TkInter(ModuleBuilder):
     """
 
     m_debian = "-tk-dev"
-    m_telltale = ["{include}/tk", "{include}/tk.h"]
+    m_telltale: ClassVar[list] = ["{include}/tk", "{include}/tk.h"]
 
     @classmethod
     def candidate_modules(cls):

{portable-python-1.8.4 → portable-python-1.8.5}/src/portable_python/external/xcpython.py

@@ -1,3 +1,5 @@
+from typing import ClassVar
+
 import runez
 
 from portable_python import LinkerOutcome, ModuleBuilder, PPG
@@ -64,7 +66,7 @@ class Gdbm(ModuleBuilder):
     """
 
     m_debian = "libgdbm-dev"
-    m_telltale = ["{include}/gdbm.h"]
+    m_telltale: ClassVar[list] = ["{include}/gdbm.h"]
 
     @property
     def url(self):
@@ -102,7 +104,7 @@ class LibFFI(ModuleBuilder):
     """
 
     m_debian = "!libffi-dev"
-    m_telltale = ["{include}/ffi.h", "{include}/ffi/ffi.h"]
+    m_telltale: ClassVar[list] = ["{include}/ffi.h", "{include}/ffi/ffi.h"]
 
     xenv_CFLAGS = "-fPIC"
 
@@ -163,7 +165,6 @@ class Openssl(ModuleBuilder):
 
 
 class Ncurses(ModuleBuilder):
-
     m_include = "ncursesw"
 
     xenv_CFLAGS = "-fPIC"
@@ -231,8 +232,14 @@ class Readline(ModuleBuilder):
 
     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",
+            "./configure",
+            "--disable-shared",
+            "--enable-static",
+            "--with-curses",
+            "--enable-multibyte",
+            "--disable-install-examples",
+            "--disable-docs",
+            "--enable-portable-binary",
         )
         self.run_make(cpu_count=0)
         self.run_make("install", cpu_count=0)
@@ -245,7 +252,7 @@ class Sqlite(ModuleBuilder):
     """
 
     m_debian = "+libsqlite3-dev"
-    m_telltale = ["{include}/sqlite3.h"]
+    m_telltale: ClassVar[list] = ["{include}/sqlite3.h"]
 
     xenv_CFLAGS = "-fPIC"
 
@@ -265,7 +272,12 @@ class Sqlite(ModuleBuilder):
 
     def _do_linux_compile(self):
         self.run_configure(
-            "./configure", "--enable-shared=no", "--enable-static=yes", "--disable-tcl", "--disable-readline", "--with-pic=yes"
+            "./configure",
+            "--enable-shared=no",
+            "--enable-static=yes",
+            "--disable-tcl",
+            "--disable-readline",
+            "--with-pic=yes",
         )
         self.run_make()
         self.run_make("install")
@@ -279,7 +291,7 @@ class Uuid(ModuleBuilder):
 
     m_debian = "+uuid-dev"
     m_include = "uuid"
-    m_telltale = ["{include}/uuid/uuid.h"]
+    m_telltale: ClassVar[list] = ["{include}/uuid/uuid.h"]
 
     xenv_CFLAGS = "-fPIC"
 
@@ -298,7 +310,6 @@ class Uuid(ModuleBuilder):
 
 
 class Xz(ModuleBuilder):
-
     m_telltale = "{include}/lzma.h"
 
     def auto_select_reason(self):
@@ -316,8 +327,14 @@ class Xz(ModuleBuilder):
     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",
+            "--enable-shared=no",
+            "--enable-static=yes",
+            "--with-pic=yes",
+            "--disable-rpath",
+            "--disable-dependency-tracking",
+            "--disable-doc",
+            "--disable-nls",
+            "--without-libintl-prefix",
         )
         self.run_make()
         self.run_make("install")
@@ -340,7 +357,7 @@ class Zlib(ModuleBuilder):
 
     @property
     def url(self):
-        return f"https://zlib.net/zlib-{self.version}.tar.gz"
+        return f"https://zlib.net/fossils/zlib-{self.version}.tar.gz"
 
     @property
     def version(self):

{portable-python-1.8.4 → portable-python-1.8.5}/src/portable_python/inspector.py

@@ -11,7 +11,6 @@ from runez.render import PrettyTable
 from portable_python.tracking import Trackable, Tracker
 from portable_python.versions import PPG
 
-
 LOG = logging.getLogger(__name__)
 RX_DYNLIB = re.compile(r"^.*\.(so(\.[0-9.]+)?|dylib)$")
 
@@ -57,10 +56,14 @@ class LibAutoCorrect:
 
     def __init__(self, prefix, install_folder, ppp_marker=None):
         """
-        Args:
-            prefix (str): Prefix used in ./configure
-            install_folder (pathlib.Path): Installation folder to scan (all paths will be relative to this)
-            ppp_marker (str | None): Associated ppp-marker, if any
+        Parameters
+        ----------
+        prefix: str
+            Prefix used in ./configure
+        install_folder : pathlib.Path
+            Installation folder to scan (all paths will be relative to this)
+        ppp_marker : str | None
+            Path to ppp-marker, if any
         """
         self.prefix = prefix
         self.install_folder = install_folder
@@ -103,6 +106,7 @@ class LibAutoCorrect:
     def _auto_correct_macos(self, path):
         """
         On macos, we use install_name_tool, example:
+
             install_name_tool -add_rpath @executable_path/../lib .../bin/python
             install_name_tool -change /<prefix>/lib/libpython3.9.dylib @rpath/libpython3.9.dylib .../bin/python
 
@@ -146,7 +150,6 @@ class LibAutoCorrect:
 
 
 class ModuleInfo:
-
     _regex = re.compile(r"^(.*?)\s*(\S+/(lib(64)?/.*))$")
 
     def __init__(self, inspector: "PythonInspector", name: str, payload: dict):
@@ -166,8 +169,7 @@ class ModuleInfo:
         path = self.filepath
         if path:
             if is_dyn_lib(path):
-                info = SoInfo(self.inspector, path)
-                return info
+                return SoInfo(self.inspector, path)
 
             if path.name.startswith("__init__."):
                 path = path.parent
@@ -200,7 +202,6 @@ class ModuleInfo:
 
 
 class CLibInfo(Trackable):
-
     def __init__(self, inspector: "PythonInspector", path: str, version: str, basename: str):
         self.inspector = inspector
         if not basename:
@@ -249,7 +250,6 @@ class CLibInfo(Trackable):
 
 
 class SoInfo(Trackable):
-
     def __init__(self, inspector: "PythonInspector", path):
         self.inspector = inspector
         self.path = runez.to_path(path)
@@ -286,7 +286,7 @@ class SoInfo(Trackable):
             if runez.which(program):
                 r = runez.run(*cmd, path, fatal=False, logger=None)
                 if not r.succeeded:
-                    logging.warning("%s exited with code %s for %s: %s" % (program, r.exit_code, path, r.full_output))
+                    logging.warning("%s exited with code %s for %s: %s", program, r.exit_code, path, r.full_output)
                     return program, None
 
                 return program, r.output
@@ -397,7 +397,6 @@ def get_lib_type(install_folder, path, basename):
 
 
 class PythonInspector:
-
     default = "_bz2,_ctypes,_curses,_decimal,_dbm,_gdbm,_lzma,_tkinter,_sqlite3,_ssl,_uuid,pip,readline,pyexpat,setuptools,zlib"
     additional = "_asyncio,_functools,_tracemalloc,dbm.gnu,ensurepip,ossaudiodev,spwd,sys,tkinter,venv,wheel"
 
@@ -500,11 +499,17 @@ class PythonInspector:
     @staticmethod
     def parsed_version(output):
         """
-        Args:
-            output (str | None): Output to parse
+        Version mentioned in `output`
 
-        Returns:
-            (str | None): Simplified version number reported
+        Parameters
+        ----------
+        output : str | None
+            Output to parse
+
+        Returns
+        -------
+        str | None
+            Simplified version number reported
         """
         if output:
             for line in output.splitlines():
@@ -535,7 +540,6 @@ def _find_parent_subfolder(folder, basename):
 
 
 class FullSoReport:
-
     def __init__(self, inspector: PythonInspector):
         self.inspector = inspector
         self.size = 0

{portable-python-1.8.4 → portable-python-1.8.5}/src/portable_python/tracking.py

@@ -2,7 +2,6 @@ import runez
 
 
 class Trackable:
-
     tracked_category = None
 
     def __eq__(self, other):
@@ -16,7 +15,6 @@ class Trackable:
 
 
 class TrackedCollection:
-
     def __init__(self, name):
         self.name = name
         self.items = []
@@ -38,7 +36,6 @@ class TrackedCollection:
 
 
 class Tracker(TrackedCollection):
-
     def __init__(self, enum, name=None):
         self.kind = enum.__name__.replace("Type", "").lower()
         super().__init__(name or self.kind)

{portable-python-1.8.4 → portable-python-1.8.5}/src/portable_python/versions.py

@@ -1,11 +1,13 @@
 """
-Tracking only a handful of most recent (and non-EOL) versions by design
-Not trying to do historical stuff here, older (or EOL-ed) versions will be removed from the list without notice
+Tracking only a handful of most recent (and non-EOL) versions by design.
+
+Not trying to do historical stuff here, older (or EOL-ed) versions will be removed from the list without notice.
 """
 
 import logging
 import os
 import re
+from typing import ClassVar
 
 import runez
 from runez.http import RestClient
@@ -49,13 +51,23 @@ class VersionFamily:
         self._fetch_versions()
         return self._versions
 
-    def get_available_versions(self) -> list:
-        """Implementation supplied by descendant: iterable of available versions, can be strings"""
+    def get_available_versions(self):
+        """
+        Available versions.
+
+        Returns
+        -------
+        list[Version]
+        """
 
     def get_builder(self):
         """
-        Returns:
-            (portable_python.PythonBuilder)
+        Builder implementation for this family.
+
+        Returns
+        -------
+        portable_python.PythonBuilder
+            Builder implementation for this family
         """
 
 
@@ -105,7 +117,6 @@ class CPythonFamily(VersionFamily):
 
 
 class Folders:
-
     def __init__(self, config: Config, base=None, family=None, version=None):
         self.config = config
         self.base_folder = runez.resolved_path(base)
@@ -160,10 +171,21 @@ class Folders:
 
 
 class PPG:
-    """Globals"""
+    """
+    Global settings for portable-python
+
+    Attributes
+    ----------
+    families : dict[str, VersionFamily]
+        Mapping of family names to implementations
+    config : portable_python.config.Config
+        Global configuration
+    target : runez.system.PlatformId
+        Target platform
+    """
 
     cpython = CPythonFamily()
-    families = dict(cpython=cpython)
+    families: ClassVar[dict] = {"cpython": cpython}
     config = Config()
     target = config.target
 

{portable-python-1.8.4 → portable-python-1.8.5/src/portable_python.egg-info}/PKG-INFO

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

{portable-python-1.8.4 → portable-python-1.8.5}/tests/test_cleanup.py

@@ -48,7 +48,7 @@ def test_cleanup(cli, monkeypatch):
     assert "MACOSX_DEPLOYMENT_TARGET" not in cli.logged
     assert "selected: all" in cli.logged
     assert f"Would symlink {install_dir}/bin/pip{f.mm} <- {install_dir}/bin/pip" in cli.logged
-    assert f"Would symlink {lib}/python{f.mm}/config-{f.mm}-darwin/libpython{f.mm}.a <- {lib}/libpython{f.mm}.a"
+    assert f"Would symlink {lib}/python{f.mm}/config-{f.mm}-darwin/libpython{f.mm}.a <- {lib}/libpython{f.mm}.a" in cli.logged
     assert f"Would tar {install_dir} -> dist/cpython-{f.version}-linux-x86_64.tar.gz" in cli.logged
 
     runez.touch("bin/brew", logger=None)

{portable-python-1.8.4 → portable-python-1.8.5}/tests/test_inspector.py

@@ -133,7 +133,7 @@ class MockSharedExeRun:
         if args[1] == "--print-rpath":
             return self.prefix
 
-    def _macos_run(self, program, *args):
+    def _macos_run(self, program, *_):
         if program == "otool":
             return f"foo/bin/python:\n {self.prefix}/lib/libpython3.9.dylib (...)\n /usr/lib/... (...)"
 

{portable-python-1.8.4 → portable-python-1.8.5}/tests/test_list.py

@@ -3,7 +3,6 @@ from runez.http import RestClient
 from portable_python import BuildSetup
 from portable_python.versions import CPythonFamily, PPG
 
-
 REST_CLIENT = RestClient()
 GH_CPYTHON_SAMPLE = """
 [
@@ -21,10 +20,12 @@ PYTHON_ORG_SAMPLE = """
 """
 
 
-@REST_CLIENT.mock({
-    "https://www.python.org/ftp/python/": PYTHON_ORG_SAMPLE,
-    "https://api.github.com/repos/python/cpython/git/matching-refs/tags/v3.": GH_CPYTHON_SAMPLE,
-})
+@REST_CLIENT.mock(
+    {
+        "https://www.python.org/ftp/python/": PYTHON_ORG_SAMPLE,
+        "https://api.github.com/repos/python/cpython/git/matching-refs/tags/v3.": GH_CPYTHON_SAMPLE,
+    },
+)
 def test_list(cli, monkeypatch):
     # Edge cases
     monkeypatch.setattr(PPG, "config", None)

{portable-python-1.8.4 → portable-python-1.8.5}/tests/test_setup.py

@@ -5,8 +5,8 @@ from portable_python import BuildSetup, ModuleBuilder
 from portable_python.versions import PPG
 
 
-def test_config(cli, monkeypatch):
-    with pytest.raises(BaseException):
+def test_config(cli):
+    with pytest.raises(runez.system.AbortException):
         PPG.config.parsed_yaml("a: b\ninvalid line", "testing")
 
     cli.run("-ntmacos-arm64", "-c", cli.tests_path("sample-config1.yml"), "build", "3.9.7", "-mnone")
@@ -34,8 +34,8 @@ def test_diagnostics(cli):
 
 def test_edge_cases(temp_folder, monkeypatch, logged):
     monkeypatch.setattr(PPG, "config", None)
-    with pytest.raises(BaseException):
-        PPG.grab_config(runez.DEV.tests_path("sample-incomplete.yml"))
+    PPG.grab_config(runez.DEV.tests_path("sample-incomplete.yml"))
+    with pytest.raises(runez.system.AbortException):
         PPG.get_folders()
     assert "Folder 'destdir' must be configured" in logged.pop()
 
@@ -56,9 +56,10 @@ def test_edge_cases(temp_folder, monkeypatch, logged):
     assert outcome.name == "failed"
     assert reason == "broken, can't compile statically with foo present"
 
-    PPG.config._sources[0].data = dict(ext="foo")
+    sources = getattr(PPG.config, "_sources", None)
+    monkeypatch.setattr(sources[0], "data", {"ext": "foo"})
     assert not logged
-    with pytest.raises(BaseException):
+    with pytest.raises(runez.system.AbortException):
         _ = BuildSetup("3.9.6")
     assert "Invalid extension 'foo'" in logged.pop()
 

portable-python-1.8.4/pyproject.toml

@@ -1,2 +0,0 @@
-[build-system]
-requires = ["setuptools", "wheel"]