Bundle auditwheel==5.4.0

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "repairwheel"
-version = "0.2.3"
+version = "0.2.4"
 description = "Repair any wheel, anywhere"
 readme = "README.md"
 requires-python = ">= 3.7"

src/repairwheel/_vendor/auditwheel/__main__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 
 from .main import main

src/repairwheel/_vendor/auditwheel/condatools.py

@@ -1,8 +1,9 @@
 """Context managers like those in wheeltools.py for unpacking
 conda packages.
 """
+from __future__ import annotations
+
 import os
-from typing import List, Optional
 
 from .tmpdirs import InTemporaryDirectory
 from .tools import tarbz2todir
@@ -22,13 +23,13 @@ def __enter__(self) -> str:
 class InCondaPkgCtx(InCondaPkg):
     def __init__(self, in_conda_pkg: str) -> None:
         super().__init__(in_conda_pkg)
-        self.path: Optional[str] = None
+        self.path: str | None = None
 
     def __enter__(self):
         self.path = super().__enter__()
         return self
 
-    def iter_files(self) -> List[str]:
+    def iter_files(self) -> list[str]:
         if self.path is None:
             raise ValueError("This function should be called from context manager")
         files = os.path.join(self.path, "info", "files")

src/repairwheel/_vendor/auditwheel/elfutils.py

@@ -1,14 +1,16 @@
+from __future__ import annotations
+
 from os.path import basename
 from pathlib import Path
-from typing import Dict, Iterator, List, Optional, Set, Tuple
+from typing import Iterator
 
 from elftools.common.exceptions import ELFError
 from elftools.elf.elffile import ELFFile
 
 from .lddtree import parse_ld_paths
 
 
-def elf_read_dt_needed(fn: str) -> List[str]:
+def elf_read_dt_needed(fn: str) -> list[str]:
     needed = []
     with open(fn, "rb") as f:
         elf = ELFFile(f)
@@ -23,7 +25,7 @@ def elf_read_dt_needed(fn: str) -> List[str]:
     return needed
 
 
-def elf_file_filter(paths: Iterator[str]) -> Iterator[Tuple[str, ELFFile]]:
+def elf_file_filter(paths: Iterator[str]) -> Iterator[tuple[str, ELFFile]]:
     """Filter through an iterator of filenames and load up only ELF
     files
     """
@@ -41,7 +43,7 @@ def elf_file_filter(paths: Iterator[str]) -> Iterator[Tuple[str, ELFFile]]:
                 continue
 
 
-def elf_find_versioned_symbols(elf: ELFFile) -> Iterator[Tuple[str, str]]:
+def elf_find_versioned_symbols(elf: ELFFile) -> Iterator[tuple[str, str]]:
     section = elf.get_section_by_name(".gnu.version_r")
 
     if section is not None:
@@ -65,7 +67,6 @@ def elf_find_ucs2_symbols(elf: ELFFile) -> Iterator[str]:
                 and sym["st_shndx"] == "SHN_UNDEF"
                 and sym["st_info"]["type"] == "STT_FUNC"
             ):
-
                 yield sym.name
 
 
@@ -84,7 +85,7 @@ def elf_references_PyFPE_jbuf(elf: ELFFile) -> bool:
     return False
 
 
-def elf_is_python_extension(fn: str, elf: ELFFile) -> Tuple[bool, Optional[int]]:
+def elf_is_python_extension(fn: str, elf: ELFFile) -> tuple[bool, int | None]:
     modname = basename(fn).split(".", 1)[0]
     module_init_f = {
         "init" + modname: 2,
@@ -102,14 +103,13 @@ def elf_is_python_extension(fn: str, elf: ELFFile) -> Tuple[bool, Optional[int]]
             and sym["st_shndx"] != "SHN_UNDEF"
             and sym["st_info"]["type"] == "STT_FUNC"
         ):
-
             return True, module_init_f[sym.name]
 
     return False, None
 
 
-def elf_read_rpaths(fn: str) -> Dict[str, List[str]]:
-    result = {"rpaths": [], "runpaths": []}  # type: Dict[str, List[str]]
+def elf_read_rpaths(fn: str) -> dict[str, list[str]]:
+    result: dict[str, list[str]] = {"rpaths": [], "runpaths": []}
 
     with open(fn, "rb") as f:
         elf = ELFFile(f)
@@ -139,7 +139,7 @@ def is_subdir(path: str, directory: str) -> bool:
     return True
 
 
-def get_undefined_symbols(path: str) -> Set[str]:
+def get_undefined_symbols(path: str) -> set[str]:
     undef_symbols = set()
     with open(path, "rb") as f:
         elf = ELFFile(f)
@@ -153,8 +153,8 @@ def get_undefined_symbols(path: str) -> Set[str]:
 
 
 def filter_undefined_symbols(
-    path: str, symbols: Dict[str, List[str]]
-) -> Dict[str, List[str]]:
+    path: str, symbols: dict[str, list[str]]
+) -> dict[str, list[str]]:
     if not symbols:
         return {}
     undef_symbols = set("*") | get_undefined_symbols(path)

src/repairwheel/_vendor/auditwheel/error.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 class AuditwheelException(Exception):
     pass
 

src/repairwheel/_vendor/auditwheel/genericpkgctx.py

@@ -1,12 +1,12 @@
-from typing import Optional, Union
+from __future__ import annotations
 
 from .condatools import InCondaPkgCtx
 from .wheeltools import InWheelCtx
 
 
 def InGenericPkgCtx(
-    in_path: str, out_path: Optional[str] = None
-) -> Union[InWheelCtx, InCondaPkgCtx]:
+    in_path: str, out_path: str | None = None
+) -> InWheelCtx | InCondaPkgCtx:
     """Factory that returns a InWheelCtx or InCondaPkgCtx
     context manager depending on the file extension
     """

src/repairwheel/_vendor/auditwheel/hashfile.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import hashlib
 from typing import BinaryIO
 

src/repairwheel/_vendor/auditwheel/lddtree.py

@@ -12,13 +12,15 @@
  a flat list.
 """
 
+from __future__ import annotations
+
 import errno
 import functools
 import glob
 import logging
 import os
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any
 
 from elftools.elf.elffile import ELFFile
 
@@ -72,13 +74,13 @@ def readlink(path: str, root: str, prefixed: bool = False) -> str:
     return normpath((root + path) if prefixed else path)
 
 
-def dedupe(items: List[str]) -> List[str]:
+def dedupe(items: list[str]) -> list[str]:
     """Remove all duplicates from ``items`` (keeping order)"""
-    seen = {}  # type: Dict[str, str]
+    seen: dict[str, str] = {}
     return [seen.setdefault(x, x) for x in items if x not in seen]
 
 
-def parse_ld_paths(str_ldpaths: str, path: str, root: str = "") -> List[str]:
+def parse_ld_paths(str_ldpaths: str, path: str, root: str = "") -> list[str]:
     """Parse the colon-delimited list of paths and apply ldso rules to each
 
     Note the special handling as dictated by the ldso:
@@ -99,7 +101,7 @@ def parse_ld_paths(str_ldpaths: str, path: str, root: str = "") -> List[str]:
     -------
         list of processed paths
     """
-    ldpaths = []  # type: List[str]
+    ldpaths: list[str] = []
     for ldpath in str_ldpaths.split(":"):
         if ldpath == "":
             # The ldso treats "" paths as $PWD.
@@ -113,7 +115,7 @@ def parse_ld_paths(str_ldpaths: str, path: str, root: str = "") -> List[str]:
 
 
 @functools.lru_cache()
-def parse_ld_so_conf(ldso_conf: str, root: str = "/", _first: bool = True) -> List[str]:
+def parse_ld_so_conf(ldso_conf: str, root: str = "/", _first: bool = True) -> list[str]:
     """Load all the paths from a given ldso config file
 
     This should handle comments, whitespace, and "include" statements.
@@ -131,7 +133,7 @@ def parse_ld_so_conf(ldso_conf: str, root: str = "/", _first: bool = True) -> Li
     -------
     list of paths found
     """
-    paths = []  # type: List[str]
+    paths: list[str] = []
 
     dbg_pfx = "" if _first else "  "
     try:
@@ -165,7 +167,7 @@ def parse_ld_so_conf(ldso_conf: str, root: str = "/", _first: bool = True) -> Li
 
 
 @functools.lru_cache()
-def load_ld_paths(root: str = "/", prefix: str = "") -> Dict[str, List[str]]:
+def load_ld_paths(root: str = "/", prefix: str = "") -> dict[str, list[str]]:
     """Load linker paths from common locations
 
     This parses the ld.so.conf and LD_LIBRARY_PATH env var.
@@ -181,7 +183,7 @@ def load_ld_paths(root: str = "/", prefix: str = "") -> Dict[str, List[str]]:
     -------
     dict containing library paths to search
     """
-    ldpaths = {"conf": [], "env": [], "interp": []}  # type: Dict
+    ldpaths: dict = {"conf": [], "env": [], "interp": []}
 
     # Load up $LD_LIBRARY_PATH.
     env_ldpath = os.environ.get("LD_LIBRARY_PATH")
@@ -258,8 +260,8 @@ def compatible_elfs(elf1: ELFFile, elf2: ELFFile) -> bool:
 
 
 def find_lib(
-    elf: ELFFile, lib: str, ldpaths: List[str], root: str = "/"
-) -> Tuple[Optional[str], Optional[str]]:
+    elf: ELFFile, lib: str, ldpaths: list[str], root: str = "/"
+) -> tuple[str | None, str | None]:
     """Try to locate a ``lib`` that is compatible to ``elf`` in the given
     ``ldpaths``
 
@@ -269,7 +271,7 @@ def find_lib(
         The elf which the library should be compatible with (ELF wise)
     lib : str
         The library (basename) to search for
-    ldpaths : List[str]
+    ldpaths : list[str]
         A list of paths to search
     root : str
        The root path to resolve symlinks
@@ -296,11 +298,11 @@ def lddtree(
     path: str,
     root: str = "/",
     prefix: str = "",
-    ldpaths: Optional[Dict[str, List[str]]] = None,
-    display: Optional[str] = None,
+    ldpaths: dict[str, list[str]] | None = None,
+    display: str | None = None,
     _first: bool = True,
-    _all_libs: Dict = {},
-) -> Dict:
+    _all_libs: dict = {},
+) -> dict:
     """Parse the ELF dependency tree of the specified file
 
     Parameters
@@ -347,15 +349,15 @@ def lddtree(
     if _first:
         _all_libs = {}
 
-    ret = {
+    ret: dict[str, Any] = {
         "interp": None,
         "path": path if display is None else display,
         "realpath": path,
         "needed": [],
         "rpath": [],
         "runpath": [],
         "libs": _all_libs,
-    }  # type: Dict[str, Any]
+    }
 
     log.debug("lddtree(%s)" % path)
 
@@ -387,9 +389,9 @@ def lddtree(
                 break
 
         # Parse the ELF's dynamic tags.
-        libs = []  # type: List[str]
-        rpaths = []  # type: List[str]
-        runpaths = []  # type: List[str]
+        libs: list[str] = []
+        rpaths: list[str] = []
+        runpaths: list[str] = []
         for segment in elf.iter_segments():
             if segment.header.p_type != "PT_DYNAMIC":
                 continue
@@ -420,7 +422,7 @@ def lddtree(
         ret["needed"] = libs
 
         # Search for the libs this ELF uses.
-        all_ldpaths = None  # type: Optional[List[str]]
+        all_ldpaths: list[str] | None = None
         for lib in libs:
             if lib in _all_libs:
                 continue

src/repairwheel/_vendor/auditwheel/libc.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 from enum import IntEnum
 

src/repairwheel/_vendor/auditwheel/main.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import argparse
 import logging
 import os
@@ -9,14 +11,12 @@
 else:
     import importlib_metadata as metadata
 
-from typing import Optional
-
 from repairwheel._vendor import auditwheel
 
 from . import main_addtag, main_lddtree, main_repair, main_show
 
 
-def main() -> Optional[int]:
+def main() -> int | None:
     if sys.platform != "linux":
         print("Error: This tool only supports Linux")
         return 1

src/repairwheel/_vendor/auditwheel/main_addtag.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 from os.path import abspath, basename, exists, join
 

src/repairwheel/_vendor/auditwheel/main_lddtree.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 
 logger = logging.getLogger(__name__)

src/repairwheel/_vendor/auditwheel/main_repair.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import argparse
 import logging
 from os.path import abspath, basename, exists, isfile

src/repairwheel/_vendor/auditwheel/main_show.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 from collections import OrderedDict
 

src/repairwheel/_vendor/auditwheel/musllinux.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 import pathlib
 import re