Refactor package imports to use importlib for better compatibility

Author: transientlunatic

asimov/__init__.py

@@ -10,20 +10,25 @@
 import os
 import logging
 
-from pkg_resources import DistributionNotFound, get_distribution, resource_string
+try:
+    from importlib.metadata import version, PackageNotFoundError
+    from importlib.resources import files
+except ImportError:
+    from importlib_metadata import version, PackageNotFoundError
+    from importlib_resources import files
 
 try:
-    __version__ = get_distribution(__name__).version
-except DistributionNotFound:
+    __version__ = version(__name__)
+except PackageNotFoundError:
     # package is not installed
     __version__ = "dev"
-    pass
 
 try:
     import ConfigParser as configparser
 except ImportError:
     import configparser
-default_config = resource_string(__name__, "{}.conf".format(__packagename__))
+
+default_config = files(__name__).joinpath(f"{__packagename__}.conf").read_bytes()
 
 config = configparser.ConfigParser()
 # if not config_file:

asimov/analysis.py

@@ -314,9 +314,12 @@ def make_config(self, filename, template_directory=None, dryrun=False):
             if hasattr(pipeline, "config_template"):
                 template_file = pipeline.config_template
             else:
-                from pkg_resources import resource_filename
+                try:
+                    from importlib.resources import files
+                except ImportError:
+                    from importlib_resources import files
 
-                template_file = resource_filename("asimov", f"configs/{template}")
+                template_file = str(files("asimov").joinpath(f"configs/{template}"))
 
         liq = Liquid(template_file)
         rendered = liq.render(production=self, analysis=self, config=config)

asimov/cli/report.py

@@ -9,7 +9,10 @@
 import click
 import pytz
 import yaml
-from pkg_resources import resource_filename
+try:
+    from importlib.resources import files
+except ImportError:
+    from importlib_resources import files
 
 import otter
 import otter.bootstrap as bt
@@ -45,7 +48,7 @@ def html(event, webdir):
         f"{webdir}/index.html",
         author="Asimov",
         title="Asimov project report",
-        theme_location=resource_filename("asimov.cli", "report-theme"),
+        theme_location=str(files("asimov.cli").joinpath("report-theme")),
         config_file=os.path.join(".asimov", "asimov.conf"),
     )
     with report:

tests/test_asimov.py

@@ -5,13 +5,16 @@
 from importlib import reload
 import asimov
 
-from pkg_resources import DistributionNotFound
+try:
+    from importlib.metadata import PackageNotFoundError
+except ImportError:
+    from importlib_metadata import PackageNotFoundError
 
 class TestAsimovBase(unittest.TestCase):
 
-    @patch("pkg_resources.get_distribution",
+    @patch("importlib.metadata.version",
            **{
-               'side_effect': DistributionNotFound,#("Not found", "asimov"),
+               'side_effect': PackageNotFoundError,
            })
     def testImports(self, blah):
         reload(asimov)