Merge pull request #133 from r1chardj0n3s/rm-imp-again

Support Python 3.12

Author: adamtheturtle

.github/workflows/ci.yml

@@ -22,9 +22,9 @@ jobs:
         # These versions match the minimum and maximum versions of pip in
         # requirements.txt.
         # An empty string here represents the latest version.
-        pip-version: ['==21.2.4', '']
+        pip-version: ['==23.2', '']
         # The minimum version should be represented in setup.py.
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12-dev"]
 
     steps:
       - uses: actions/checkout@v4
@@ -53,15 +53,20 @@ jobs:
           # We avoid "--upgrade" as we do version tests for the "pip" dependency.
           python -m pip install --ignore-installed --editable .[dev]
 
-      - name: "Lint"
+      # Separate Pylint as it fails on Python 3.12 for unrelated reasons.
+      - name: "Lint without pylint"
         run: |
           mypy .
           ruff .
           black --check .
-          pylint pip_check_reqs tests
           pip-extra-reqs pip_check_reqs
           pip-missing-reqs pip_check_reqs
 
+      - name: "Lint pylint"
+        if: matrix.python-version != '3.12-dev'
+        run: |
+          pylint pip_check_reqs tests
+
       - name: "Run tests"
         run: |
           pytest -s -vvv --cov-fail-under 100 --cov=pip_check_reqs/ --cov=tests tests/ --cov-report=xml

CHANGELOG.rst

@@ -2,9 +2,15 @@
 Release History
 ---------------
 
+2.5.0
+
+- Support Python 3.10.
+- Remove support for Python 3.8.
+- Bump `pip` requirement to 23.2.
+
 2.4.4
 
-- Bump `packaging` requirement to >= 20.5. Older versions of `pip-check-reqs`     may be broken with the previously-specified version requirements.
+- Bump `packaging` requirement to >= 20.5. Older versions of `pip-check-reqs` may be broken with the previously-specified version requirements.
 
 2.4.3
 

pip_check_reqs/__init__.py

@@ -1,3 +1,3 @@
 """Package for finding missing and extra requirements."""
 
-__version__ = "2.4.4"
+__version__ = "2.5.0"

pip_check_reqs/common.py

@@ -4,7 +4,7 @@
 
 import ast
 import fnmatch
-import imp
+import importlib
 import logging
 import os
 import re
@@ -77,41 +77,32 @@ def _add_module(self, modname: str, lineno: int) -> None:
             return
         path = None
         progress = []
-        modpath = last_modpath = None
+        modpath = None
         for modname_part in modname.split("."):
-            try:
-                _, modpath, _ = imp.find_module(modname_part, path)
-            except ImportError:
-                # the component specified at this point is not importable
-                # (is just an attribute of the module)
-                # *or* it's not actually installed, so we don't care either
-                break
-
-            # success! we found *something*
-            progress.append(modname_part)
+            find_spec_result = importlib.util.find_spec(
+                name=modname_part,
+                package=path,
+            )
 
-            # we might have previously seen a useful path though...
-            if modpath is None:
-                # the `sys` module will hit this code path, and `os` will on
-                # 3.11+.
-                # Possibly others will, but I've not discovered them.
-                modpath = last_modpath
+            if find_spec_result is None:
+                # The component specified at this point is not installed.
                 break
 
-            # ... though it might not be a file, so not interesting to us
-            if not Path(modpath).is_dir():
-                break
+            modpath = find_spec_result.origin
 
-            path = [modpath]
-            last_modpath = modpath
+            # success! we found *something*
+            progress.append(modname_part)
 
         if modpath is None:
             # the module doesn't actually appear to exist on disk
             return
 
         modname = ".".join(progress)
         if modname not in self._modules:
-            self._modules[modname] = FoundModule(modname, modpath)
+            self._modules[modname] = FoundModule(
+                modname=modname,
+                filename=str(Path(modpath).parent),
+            )
         assert isinstance(self._location, str)
         self._modules[modname].locations.append((self._location, lineno))
 

requirements.txt

@@ -1,3 +1,3 @@
 packaging >= 20.5
 # Pinned pip versions are matched in the GitHub workflows CI matrix.
-pip >= 21.2.4
+pip >= 23.2

setup.py

@@ -51,12 +51,12 @@ def _get_dependencies(requirements_file: Path) -> list[str]:
         "Intended Audience :: Developers",
         "Topic :: Software Development :: Build Tools",
         "License :: OSI Approved :: MIT License",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
     ],
-    python_requires=">=3.8.0",
+    python_requires=">=3.9.0",
     packages=["pip_check_reqs"],
     entry_points={
         "console_scripts": [

tests/test_common.py

@@ -44,7 +44,7 @@ def test_found_module() -> None:
         ("import ast, pathlib", ["ast", "pathlib"]),
         ("from pathlib import Path", ["pathlib"]),
         ("from string import hexdigits", ["string"]),
-        ("import distutils.command.check", ["distutils.command.check"]),
+        ("import urllib.request", ["urllib"]),
         ("import spam", []),  # don't break because bad programmer
         ("from .foo import bar", []),  # don't break on relative imports
         ("from . import baz", []),
@@ -94,24 +94,26 @@ def test_pyfiles_package(tmp_path: Path) -> None:
     ]
 
 
-# Beware - using `sys` or `os` here can have weird results.
-# See the comment in the implementation.
-# We don't mind so much as we only really use this for third party packages.
 @pytest.mark.parametrize(
     ("ignore_ham", "ignore_hashlib", "expect", "locs"),
     [
         (
             False,
             False,
-            ["ast", "pathlib", "hashlib"],
+            ["ast", "pathlib", "hashlib", "sys"],
             [
                 ("spam.py", 2),
                 ("ham.py", 2),
             ],
         ),
-        (False, True, ["ast", "pathlib"], [("spam.py", 2), ("ham.py", 2)]),
-        (True, False, ["ast"], [("spam.py", 2)]),
-        (True, True, ["ast"], [("spam.py", 2)]),
+        (
+            False,
+            True,
+            ["ast", "pathlib", "sys"],
+            [("spam.py", 2), ("ham.py", 2)],
+        ),
+        (True, False, ["ast", "sys"], [("spam.py", 2)]),
+        (True, True, ["ast", "sys"], [("spam.py", 2)]),
     ],
 )
 def test_find_imported_modules(