Update pip to version 24.1.2 and include the necessary MANIFEST files

Signed-off-by: Xiaochao Dong (@damnever) <[email protected]>

.github/workflows/ci.yml

@@ -25,6 +25,8 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
+      - name: Upgrade pip
+        run: pip install --upgrade pip
       - name: Run tests with requirements.txt
         run: |
           python -m venv venv-requirements-txt
@@ -37,3 +39,4 @@ jobs:
           source venv-pip-e/bin/activate
           pip install -e .
           python -m unittest discover pigar/tests/ -t . -v
+          pigar --version

MANIFEST.in

@@ -2,5 +2,11 @@ include pigar/.db.sqlite3
 include CHANGELOG.md
 include README.md
 include LICENSE
-include pigar/_vendor/pip/LICENSE.txt
 include makefile
+
+include pigar/_vendor/README.md
+include pigar/_vendor/vendor.txt
+recursive-include pigar/_vendor *LICENSE*
+recursive-include pigar/_vendor *COPYING*
+recursive-include pigar/_vendor *.pem
+recursive-include pigar/_vendor py.typed

pigar/_vendor/pip/__init__.py

@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "24.1.1"
+__version__ = "24.1.2"
 
 
 def main(args: Optional[List[str]] = None) -> int:

pigar/_vendor/pip/_internal/utils/unpacking.py

@@ -190,9 +190,19 @@ def untar_file(filename: str, location: str) -> None:
         else:
             default_mode_plus_executable = _get_default_mode_plus_executable()
 
+            if leading:
+                # Strip the leading directory from all files in the archive,
+                # including hardlink targets (which are relative to the
+                # unpack location).
+                for member in tar.getmembers():
+                    name_lead, name_rest = split_leading_dir(member.name)
+                    member.name = name_rest
+                    if member.islnk():
+                        lnk_lead, lnk_rest = split_leading_dir(member.linkname)
+                        if lnk_lead == name_lead:
+                            member.linkname = lnk_rest
+
             def pip_filter(member: tarfile.TarInfo, path: str) -> tarfile.TarInfo:
-                if leading:
-                    member.name = split_leading_dir(member.name)[1]
                 orig_mode = member.mode
                 try:
                     try:

pigar/_vendor/pip/_vendor/requests/packages.py

@@ -13,8 +13,7 @@
     for mod in list(sys.modules):
         if mod == vendored_package or mod.startswith(vendored_package + '.'):
             unprefixed_mod = mod[len("pigar._vendor.pip._vendor."):]
-            sys.modules['pigar._vendor.pip._vendor.requests.packages.' +
-                        unprefixed_mod] = sys.modules[mod]
+            sys.modules['pigar._vendor.pip._vendor.requests.packages.' + unprefixed_mod] = sys.modules[mod]
 
 if chardet is not None:
     target = chardet.__name__

pigar/_vendor/vendor.txt

@@ -1 +1 @@
-pip==24.1.1
+pip==24.1.2