Remove usage of pkg_resources

ome · Nov 5, 2024 · 35dd060 · 35dd060
1 parent 213bb61
commit 35dd060
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/omero/plugins/web.py b/omero/plugins/web.py
@@ -21,7 +21,7 @@
 from omero_ext.argparse import SUPPRESS
 
 from omero_ext.path import path
-from pkg_resources import resource_string
+from importlib_resources import files
 
 from omero.install.windows_warning import windows_warning, WINDOWS_WARNING
 
@@ -342,8 +342,8 @@ def config(self, args, settings):
         if settings.APPLICATION_SERVER not in settings.WSGI_TYPES:
             self.ctx.die(679, "Web template configuration requires" "wsgi or wsgi-tcp.")
 
-        template_file = "%s.conf.template" % server
-        c = resource_string("omeroweb", "templates/" + template_file).decode("utf-8")
+        template_file = "templates/%s.conf.template" % server
+        c = files("omeroweb").joinpath(template_file).read_text()
         self.ctx.out(c % d)
 
     def syncmedia(self, args):

diff --git a/setup.py b/setup.py
@@ -64,6 +64,7 @@ def read(fname):
         "pytz",
         "portalocker",
         "packaging",
+        "importlib-resources",
     ],
     include_package_data=True,
     tests_require=["pytest"],