Update Kinto to use importlib rather than pkg_resources

docs/conf.py

@@ -13,8 +13,7 @@
 import datetime
 import os
 import sys
-
-import pkg_resources
+from importlib.metadata import version as get_version
 
 
 # abspath because this could be __main__, in which case it may not
@@ -74,7 +73,7 @@
 #
 # The short X.Y version.
 # The full version, including alpha/beta/rc tags.
-version = pkg_resources.get_distribution("kinto").version
+version = get_version("kinto")
 release = ".".join(version.split(".")[:2])
 
 # List of patterns, relative to source directory, that match files and

docs/core/quickstart.rst

@@ -34,13 +34,13 @@ just add some extra initialization code:
 .. code-block:: python
     :emphasize-lines: 3,6,7,13
 
-    import pkg_resources
+    from importlib.metadata import version
 
     import kinto.core
     from pyramid.config import Configurator
 
     # Module version, as defined in PEP-0396.
-    __version__ = pkg_resources.get_distribution(__package__).version
+    __version__ = version(__package__)
 
 
     def main(global_config, **settings):

kinto/__init__.py

@@ -1,6 +1,6 @@
 import logging
+from importlib.metadata import version
 
-import pkg_resources
 from pyramid.authorization import Authenticated, Everyone
 from pyramid.config import Configurator
 from pyramid.settings import asbool
@@ -11,7 +11,7 @@
 
 
 # Module version, as defined in PEP-0396.
-__version__ = pkg_resources.get_distribution(__package__).version
+__version__ = version(__package__)
 
 # Implemented HTTP API Version
 HTTP_API_VERSION = "1.23"

kinto/core/__init__.py

@@ -2,8 +2,8 @@
 
 import logging
 import tempfile
+from importlib.metadata import version as get_version
 
-import pkg_resources
 from dockerflow import logging as dockerflow_logging
 from pyramid.settings import aslist
 
@@ -29,7 +29,7 @@
 __all__ = ["initialize", "load_default_settings", "Service"]
 
 # Module version, as defined in PEP-0396.
-__version__ = pkg_resources.get_distribution("kinto").version  # FIXME?
+__version__ = get_version("kinto")
 
 DEFAULT_SETTINGS = {
     "backoff": None,

kinto/core/cornice_swagger/views.py

@@ -1,9 +1,9 @@
 import importlib
+import importlib.resources
 from string import Template
 
 import cornice
 import cornice_swagger
-import pkg_resources
 from pyramid.response import Response
 
 
@@ -33,8 +33,10 @@ def swagger_ui_template_view(request):
     package, callable = script_generator.split(":")
     imported_package = importlib.import_module(package)
     script_callable = getattr(imported_package, callable)
-    template = pkg_resources.resource_string("cornice_swagger", "templates/index.html").decode(
-        "utf8"
+    template = (
+        importlib.resources.files("cornice_swagger")
+        .joinpath("templates/index.html")
+        .read_text(encoding="utf-8")
     )
 
     html = Template(template).safe_substitute(
@@ -70,9 +72,11 @@ def swagger_ui_script_template(request, **kwargs):
     into index template
     """
     swagger_spec_url = request.route_url("cornice_swagger.open_api_path")
-    template = pkg_resources.resource_string(
-        "cornice_swagger", "templates/index_script_template.html"
-    ).decode("utf8")
+    template = (
+        importlib.resources.files("cornice_swagger")
+        .joinpath("templates/index_script_template.html")
+        .read_text(encoding="utf-8")
+    )
     return Template(template).safe_substitute(
         swagger_spec_url=swagger_spec_url,
     )