Undo 'relpath' difficulties with the latest pip

Author: adamtheturtle

.github/workflows/ci.yml

@@ -44,11 +44,11 @@ jobs:
 
       - name: "Install dependencies"
         run: |
+          python -m pip install --upgrade 'pip ${{ matrix.pip-version }}'
           # We use '--ignore-installed' to avoid GitHub's cache which can cause
           # issues - we have seen packages from this cache be cause trouble with
           # pip-extra-reqs.
           python -m pip install --ignore-installed --upgrade --editable .[dev]
-          python -m pip install --upgrade 'pip ${{ matrix.pip-version }}'
           python -m pip install flake8
 
       - name: "Lint"

pip_check_reqs/find_extra_reqs.py

@@ -1,5 +1,6 @@
 import collections
 import logging
+import pathlib
 import optparse
 import os
 import sys
@@ -28,7 +29,16 @@ def find_extra_reqs(options, requirements_filename):
         else:
             package_name = package.name
             package_location = package.location
-            package_files = package.files or []
+            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()
+                if item_location.is_relative_to(here):
+                    relative_item_location = item_location.relative_to(here)
+                else:
+                    relative_item_location = item_location
+                package_files.append(str(relative_item_location))
 
         log.debug('installed package: %s (at %s)', package_name,
                   package_location)

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
@@ -35,7 +36,16 @@ def find_missing_reqs(options, requirements_filename):
         else:
             package_name = package.name
             package_location = package.location
-            package_files = package.files or []
+            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()
+                if item_location.is_relative_to(here):
+                    relative_item_location = item_location.relative_to(here)
+                else:
+                    relative_item_location = item_location
+                package_files.append(str(relative_item_location))
 
         log.debug('installed package: %s (at %s)', package_name,
                   package_location)