Merge 6e5e40e7e4 into 472fb9f6ac

[skip ci]

maubot/cli/commands/init.py

@@ -17,7 +17,7 @@ import os
 
 from jinja2 import Template
 from packaging.version import Version
-from pkg_resources import resource_string
+import importlib.resources as resources
 
 from .. import cliq
 from ..cliq import SPDXValidator, VersionValidator
@@ -33,9 +33,9 @@ def load_templates():
     global mod_template, meta_template, base_config, loaded
     if loaded:
         return
-    meta_template = Template(resource_string("maubot.cli", "res/maubot.yaml.j2").decode("utf-8"))
+    meta_template = Template(resources.files("maubot.cli").joinpath("res/maubot.yaml.j2").read_text(encoding="utf-8"))
-    mod_template = Template(resource_string("maubot.cli", "res/plugin.py.j2").decode("utf-8"))
+    mod_template = Template(resources.files("maubot.cli").joinpath("res/plugin.py.j2").read_text(encoding="utf-8"))
-    base_config = resource_string("maubot.cli", "res/config.yaml").decode("utf-8")
+    base_config = resources.files("maubot.cli").joinpath("res/config.yaml").read_text(encoding="utf-8")
     loaded = True
 
 

maubot/cli/util/spdx.py

@@ -18,7 +18,7 @@ from __future__ import annotations
 import json
 import zipfile
 
-import pkg_resources
+import importlib.resources as resources
 
 spdx_list: dict[str, dict[str, str]] | None = None
 
@@ -27,7 +27,7 @@ def load() -> None:
     global spdx_list
     if spdx_list is not None:
         return
-    with pkg_resources.resource_stream("maubot.cli", "res/spdx.json.zip") as disk_file:
+    with resources.files("maubot.cli").joinpath("res/spdx.json.zip").open("rb") as disk_file:
         with zipfile.ZipFile(disk_file) as zip_file:
             with zip_file.open("spdx.json") as file:
                 spdx_list = json.load(file)

maubot/example-config.yaml

@@ -1,5 +1,4 @@
 # The full URI to the database. SQLite and Postgres are fully supported.
-# Other DBMSes supported by SQLAlchemy may or may not work.
 # Format examples:
 #   SQLite:   sqlite:filename.db
 #   Postgres: postgresql://username:password@hostname/dbname

maubot/server.py

@@ -23,7 +23,7 @@ import logging
 from aiohttp import hdrs, web
 from aiohttp.abc import AbstractAccessLogger
 from yarl import URL
-import pkg_resources
+import importlib.resources as resources
 
 from mautrix.api import Method, PathBuilder
 
@@ -103,7 +103,7 @@ class MaubotServer:
             ui_base = ""
         directory = self.config[
             "server.override_resource_path"
-        ] or pkg_resources.resource_filename("maubot", "management/frontend/build")
+        ] or resources.files("maubot").joinpath("management/frontend/build")
         self.app.router.add_static(f"{ui_base}/static", f"{directory}/static")
         self.setup_static_root_files(directory, ui_base)