ci, plugins: Python 3.10 and other improvements

.github/workflows/ci.yml

@@ -20,9 +20,10 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - 3.7
-          - 3.8
-          - 3.9
+          - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}

dev-requirements.txt

@@ -5,7 +5,7 @@ flake8-future-import
 flake8-import-order
 flake8-type-checking; python_version >= '3.8'
 furo==2022.4.7  # Sphinx theme
-pytest~=6.2.5
+pytest~=7.1.0
 pytest-vcr~=1.0.2
 requests-mock~=1.9.3
 sphinx>=4,<5

pyproject.toml

@@ -28,6 +28,7 @@ classifiers = [
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
     "Topic :: Communications :: Chat :: Internet Relay Chat",
 ]
 requires-python = ">=3.7"
@@ -53,11 +54,18 @@ dependencies = [
 "Source" = "https://github.com/sopel-irc/sopel"
 "Coverage" = "https://coveralls.io/github/sopel-irc/sopel"
 
-
 [project.scripts]
 sopel = "sopel.cli.run:main"
 sopel-config = "sopel.cli.config:main"
 sopel-plugins = "sopel.cli.plugins:main"
 
 [project.entry-points.pytest11]
 pytest-sopel = "sopel.tests.pytest_plugin"
+
+[tool.pytest.ini_options]
+python_files = "*.py"
+addopts = "--tb=short -p no:nose"
+norecursedirs = "build contrib"
+filterwarnings = [
+    "ignore::pytest.PytestAssertRewriteWarning",
+]

setup.cfg

@@ -30,8 +30,3 @@ no-accept-encodings = True
 [mypy]
 plugins = sqlalchemy.ext.mypy.plugin
 show_error_codes = True
-
-[tool:pytest]
-python_files = *.py
-addopts = --tb=short
-norecursedirs = contrib

sopel/plugins/__init__.py

@@ -29,7 +29,7 @@
 from __future__ import annotations
 
 import collections
-import imp
+import importlib
 import itertools
 import os
 
@@ -67,12 +67,13 @@ def find_internal_plugins():
     Internal plugins can be found under ``sopel.modules``. This list does not
     include the ``coretasks`` plugin.
     """
-    plugin_dir = imp.find_module(
-        'modules',
-        [imp.find_module('sopel')[1]]
-    )[1]
+    modules = importlib.util.find_spec('sopel.modules')
+    plugin_list = itertools.chain.from_iterable(
+        _list_plugin_filenames(path)
+        for path in modules.submodule_search_locations
+    )
 
-    for name, _ in _list_plugin_filenames(plugin_dir):
+    for name, _ in set(plugin_list):
         yield handlers.PyModulePlugin(name, 'sopel.modules')