Merge pull request #65 from r1chardj0n3s/support-latest-pip-gte-21.2.1

Fix commands on pip 21.2.1

Author: adamtheturtle

pip_check_reqs/find_extra_reqs.py

@@ -1,5 +1,6 @@
 import collections
 import logging
+import pathlib
 import optparse
 import os
 import sys
@@ -21,22 +22,44 @@ def find_extra_reqs(options, requirements_filename):
     installed_files = {}
     all_pkgs = (pkg.project_name for pkg in get_installed_distributions())
     for package in search_packages_info(all_pkgs):
-        log.debug('installed package: %s (at %s)', package['name'],
-                  package['location'])
-        for package_file in package.get('files', []) or []:
+        if isinstance(package, dict):  # pragma: no cover
+            package_name = package['name']
+            package_location = package['location']
+            package_files = package.get('files', []) or []
+        else:  # pragma: no cover
+            package_name = package.name
+            package_location = package.location
+            package_files = []
+            for item in (package.files or []):
+                here = pathlib.Path('.').resolve()
+                item_location_rel = (pathlib.Path(package_location) / item)
+                item_location = item_location_rel.resolve()
+                try:
+                    relative_item_location = item_location.relative_to(here)
+                except ValueError:
+                    # Ideally we would use Pathlib.is_relative_to rather than
+                    # checking for a ValueError, but that is only available in
+                    # Python 3.9+.
+                    relative_item_location = item_location
+                package_files.append(str(relative_item_location))
+
+        log.debug('installed package: %s (at %s)', package_name,
+                  package_location)
+        for package_file in package_files:
             path = os.path.realpath(
-                os.path.join(package['location'], package_file),
+                os.path.join(package_location, package_file),
             )
-            installed_files[path] = package['name']
+            installed_files[path] = package_name
             package_path = common.is_package_file(path)
             if package_path:
                 # we've seen a package file so add the bare package directory
                 # to the installed list as well as we might want to look up
                 # a package by its directory path later
-                installed_files[package_path] = package['name']
+                installed_files[package_path] = package_name
 
     # 3. match imported modules against those packages
     used = collections.defaultdict(list)
+
     for modname, info in used_modules.items():
         # probably standard library if it's not in the files list
         if info.filename in installed_files:

pip_check_reqs/find_missing_reqs.py

@@ -2,6 +2,7 @@
 import logging
 import optparse
 import os
+import pathlib
 import sys
 
 from packaging.utils import canonicalize_name
@@ -28,19 +29,40 @@ def find_missing_reqs(options, requirements_filename):
     installed_files = {}
     all_pkgs = (pkg.project_name for pkg in get_installed_distributions())
     for package in search_packages_info(all_pkgs):
-        log.debug('installed package: %s (at %s)', package['name'],
-                  package['location'])
-        for package_file in package.get('files', []) or []:
+        if isinstance(package, dict):  # pragma: no cover
+            package_name = package['name']
+            package_location = package['location']
+            package_files = package.get('files', []) or []
+        else:  # pragma: no cover
+            package_name = package.name
+            package_location = package.location
+            package_files = []
+            for item in (package.files or []):
+                here = pathlib.Path('.').resolve()
+                item_location_rel = (pathlib.Path(package_location) / item)
+                item_location = item_location_rel.resolve()
+                try:
+                    relative_item_location = item_location.relative_to(here)
+                except ValueError:
+                    # Ideally we would use Pathlib.is_relative_to rather than
+                    # checking for a ValueError, but that is only available in
+                    # Python 3.9+.
+                    relative_item_location = item_location
+                package_files.append(str(relative_item_location))
+
+        log.debug('installed package: %s (at %s)', package_name,
+                  package_location)
+        for package_file in package_files:
             path = os.path.realpath(
-                os.path.join(package['location'], package_file),
+                os.path.join(package_location, package_file),
             )
-            installed_files[path] = package['name']
+            installed_files[path] = package_name
             package_path = common.is_package_file(path)
             if package_path:
                 # we've seen a package file so add the bare package directory
                 # to the installed list as well as we might want to look up
                 # a package by its directory path later
-                installed_files[package_path] = package['name']
+                installed_files[package_path] = package_name
 
     # 3. match imported modules against those packages
     used = collections.defaultdict(list)