No more pkg_resources

Makefile

@@ -68,7 +68,7 @@ deps-test:
 
 # (Re)install the tool
 install:
-	$(PIP) install -U pip wheel
+	$(PIP) install -U pip wheel setuptools fastentrypoints
 	for mod in $(BUILD_ORDER);do (cd $$mod ; $(PIP_INSTALL) .);done
 
 # Install with pip install -e

ocrd/ocrd/constants.py

@@ -1,7 +1,7 @@
 """
 Constants for ocrd.
 """
-from pkg_resources import resource_filename
+from ocrd_utils.package_resources import resource_filename
 
 __all__ = [
     'TMP_PREFIX',

ocrd/ocrd/processor/builtin/dummy_processor.py

@@ -1,6 +1,6 @@
 # pylint: disable=missing-module-docstring,invalid-name
 from os.path import join, basename
-from pkg_resources import resource_string
+from ocrd_utils.package_resources import resource_string
 
 import click
 
@@ -17,7 +17,7 @@
 )
 from ocrd_modelfactory import page_from_file
 
-OCRD_TOOL = parse_json_string_with_comments(resource_string(__name__, 'dummy/ocrd-tool.json').decode('utf8'))
+OCRD_TOOL = parse_json_string_with_comments(resource_string(__name__, 'ocrd-tool.json').decode('utf8'))
 
 class DummyProcessor(Processor):
     """

ocrd/ocrd/workspace_bagger.py

@@ -6,8 +6,6 @@
 import re
 import tempfile
 import sys
-
-from pkg_resources import get_distribution
 from bagit import Bag, make_manifests  # pylint: disable=no-name-in-module
 
 from ocrd_utils import (
@@ -25,6 +23,12 @@
 
 from .workspace import Workspace
 
+try:
+    from importlib.metadata import version
+except ImportError:
+    from importlib_metadata import version
+
+
 tempfile.tempdir = '/tmp' # TODO hard-coded
 
 BACKUPDIR = join('/tmp', TMP_BAGIT_PREFIX + 'backup')
@@ -123,8 +127,8 @@ def _set_bag_info(self, bag, total_bytes, total_files, ocrd_identifier, ocrd_man
         bag.info['BagIt-Profile-Identifier'] = OCRD_BAGIT_PROFILE_URL
         bag.info['Bag-Software-Agent'] = 'ocrd/core %s (bagit.py %s, bagit_profile %s) [cmdline: "%s"]' % (
             VERSION, # TODO
-            get_distribution('bagit').version,
-            get_distribution('bagit_profile').version,
+            version('bagit'),
+            version('bagit_profile'),
             ' '.join(sys.argv))
 
         bag.info['Ocrd-Identifier'] = ocrd_identifier

ocrd/requirements.txt

@@ -8,3 +8,5 @@ Flask
 jsonschema
 pyyaml
 Deprecated == 1.2.0
+importlib_metadata;python_version<'3.8'
+importlib_resources;python_version<'3.8'

ocrd/setup.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import fastentrypoints
 from setuptools import setup, find_packages
 from ocrd_utils import VERSION
 

ocrd_models/ocrd_models/constants.py

@@ -1,7 +1,7 @@
 """
 Constants for ocrd_models.
 """
-from pkg_resources import resource_string
+from ocrd_utils.package_resources import resource_string
 import re
 
 __all__ = [

ocrd_utils/ocrd_utils/constants.py

@@ -1,10 +1,13 @@
 """
 Constants for ocrd_utils.
 """
-from pkg_resources import get_distribution
 from re import compile as regex_compile
 from os import environ
 from os.path import join, expanduser
+try:
+    from importlib.metadata import version
+except ImportError:
+    from importlib_metadata import version
 
 __all__ = [
     'EXT_TO_MIME',
@@ -22,7 +25,7 @@
     'XDG_DATA_HOME',
 ]
 
-VERSION = get_distribution('ocrd_utils').version
+VERSION = version('ocrd_utils')
 
 MIMETYPE_PAGE = 'application/vnd.prima.page+xml'
 

ocrd_utils/ocrd_utils/package_resources.py

@@ -0,0 +1,45 @@
+import atexit
+from contextlib import ExitStack
+from pathlib import Path
+
+try:
+    from importlib.resources import path, read_binary
+except ImportError:
+    from importlib_resources import path, read_binary  # type: ignore
+
+
+_file_manager = ExitStack()
+atexit.register(_file_manager.close)
+
+
+def resource_filename(package: str, resource: str) -> Path:
+    """
+    Reimplementation of the function with the same name from pkg_resources
+
+    Using importlib for better performance
+
+    package : str
+        The package from where to start looking for resource (often __name__)
+    resource : str
+        The resource to look up
+    """
+    parent_package = package.rsplit('.',1)[0]
+    return _file_manager.enter_context(path(parent_package, resource))
+
+
+def resource_string(package: str, resource: str) -> bytes:
+    """
+    Reimplementation of the function with the same name from pkg_resources
+
+    Using importlib for better performance
+
+    package : str
+        The package from where to start looking for resource (often __name__)
+    resource : str
+        The resource to look up
+    """
+    parent_package = package.rsplit('.',1)[0]
+    return read_binary(parent_package, resource)
+
+
+__all__ = ['resource_filename', 'resource_string']

ocrd_validators/ocrd_validators/constants.py

@@ -2,7 +2,7 @@
 Constants for ocrd_validators.
 """
 import yaml
-from pkg_resources import resource_string, resource_filename
+from ocrd_utils.package_resources import resource_string, resource_filename
 
 __all__ = [
     'OCRD_TOOL_SCHEMA',