refactor: update importlib

importlib.metadata was added in 3.8. Now that we no longer support 3.7,
we can use it directly, rather than using the backported implementation.
(We still need to use the backported version of importlib_resources
until we drop 3.8.)

Author: apotterri

_appmap/configuration.py

@@ -2,14 +2,14 @@
 Manage Configuration AppMap recorder for Python.
 """
 
+import importlib.metadata
 import inspect
 import os
 import sys
 from os.path import realpath
 from pathlib import Path
 from textwrap import dedent
 
-import importlib_metadata
 import yaml
 from yaml.parser import ParserError
 
@@ -314,7 +314,7 @@ class DistMatcher(PathMatcher):
     def __init__(self, dist, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.dist = dist
-        self.files = [str(pp.locate()) for pp in importlib_metadata.files(dist)]
+        self.files = [str(pp.locate()) for pp in importlib.metadata.files(dist)]
 
     def matches(self, filterable):
         try:

_appmap/test/appmap_test_base.py

@@ -1,6 +1,7 @@
 import json
 import platform
 import re
+from importlib.metadata import version as dist_version
 from operator import itemgetter
 
 import pytest
@@ -60,7 +61,7 @@ def normalize_metadata(metadata):
             for f in frameworks:
                 if f["name"] == "pytest":
                     v = f.pop("version")
-                    assert v == pytest.__version__
+                    assert v == dist_version("pytest")
 
     def normalize_appmap(self, generated_appmap):
         """

_appmap/test/normalize.py

@@ -1,11 +1,10 @@
 import json
 import platform
 import re
+from importlib.metadata import version as dist_version
 from operator import itemgetter
 from typing import List
 
-import pytest
-
 
 def normalize_path(path):
     """
@@ -45,7 +44,7 @@ def normalize_metadata(metadata):
         for f in frameworks:
             if f["name"] == "pytest":
                 v = f.pop("version")
-                assert v == pytest.__version__
+                assert v == dist_version("pytest")
 
 
 def normalize_headers(dct):

_appmap/test/test_command.py

@@ -1,9 +1,9 @@
 import json
 import re
 from distutils.dir_util import copy_tree
+from importlib.metadata import version
 
 import pytest
-from importlib_metadata import version
 
 import _appmap
 from appmap.command import appmap_agent_init, appmap_agent_status, appmap_agent_validate

_appmap/test/test_flask.py

@@ -3,7 +3,11 @@
 
 import importlib
 import os
-from threading import Thread
+import socket
+import sys
+from importlib.metadata import version
+from pathlib import Path
+from types import SimpleNamespace as NS
 
 import flask
 import pytest
@@ -56,7 +60,7 @@ def flask_client(app):
 @pytest.mark.appmap_enabled(env={"APPMAP_RECORD_REQUESTS": "false"})
 def test_framework_metadata(client, events):  # pylint: disable=unused-argument
     client.get("/")
-    assert Metadata()["frameworks"] == [{"name": "flask", "version": flask.__version__}]
+    assert Metadata()["frameworks"] == [{"name": "flask", "version": version("flask")}]
 
 
 @pytest.mark.appmap_enabled(env={"APPMAP_RECORD_REQUESTS": "false"})

_appmap/test/test_sqlalchemy.py

@@ -1,7 +1,8 @@
 """Tests for the SQLAlchemy integration."""
 
+from importlib.metadata import version
+
 import pytest
-import sqlalchemy
 from sqlalchemy import (
     Column,
     ForeignKey,
@@ -27,9 +28,7 @@ def test_sql_capture(connection, events):
             {"sql": "SELECT 1", "database_type": "sqlite"}
         )
         assert events[0].sql_query["server_version"].startswith("3.")
-        assert Metadata()["frameworks"] == [
-            {"name": "SQLAlchemy", "version": sqlalchemy.__version__}
-        ]
+        assert Metadata()["frameworks"] == [{"name": "SQLAlchemy", "version": version("sqlalchemy")}]
 
     @staticmethod
     # pylint: disable=unused-argument

appmap/command/appmap_agent_status.py

@@ -1,8 +1,7 @@
 import json
 import sys
 from argparse import ArgumentParser
-
-from importlib_metadata import PackageNotFoundError, distribution, version
+from importlib.metadata import PackageNotFoundError, distribution, version
 
 from _appmap.configuration import Config
 from _appmap.env import Env

appmap/command/appmap_agent_validate.py

@@ -1,7 +1,7 @@
 import json
 import sys
+from importlib.metadata import PackageNotFoundError, version
 
-from importlib_metadata import PackageNotFoundError, version
 from packaging.version import parse
 
 from _appmap.py_version_check import AppMapPyVerException, check_py_version

appmap/flask.py

@@ -1,5 +1,6 @@
 import re
 import time
+from importlib.metadata import version
 
 import flask
 import flask.cli
@@ -96,7 +97,7 @@ def request_started(self, _, **__):
         self.before_request_hook(request)
 
     def before_request_main(self, rec, req):
-        Metadata.add_framework("flask", flask.__version__)
+        Metadata.add_framework("flask", version("flask"))
         np = None
         if req.url_rule:
             # pragma pylint: disable=line-too-long

appmap/pytest.py

@@ -1,3 +1,5 @@
+from importlib.metadata import version
+
 import pytest
 
 from _appmap import noappmap, testing_framework, wrapt
@@ -26,7 +28,7 @@ def __call__(self, wrapped, _, args, kwargs):
     @pytest.hookimpl
     def pytest_sessionstart(session):
         session.appmap = testing_framework.session(
-            name="pytest", recorder_type="tests", version=pytest.__version__
+            name="pytest", recorder_type="tests", version=version("pytest")
         )
 
     @pytest.hookimpl