diff --git a/cds/modules/fixtures/cli.py b/cds/modules/fixtures/cli.py index 5576e6d69..5be2dc24e 100644 --- a/cds/modules/fixtures/cli.py +++ b/cds/modules/fixtures/cli.py @@ -29,7 +29,7 @@ import uuid import click -import pkg_resources +import importlib.resources as resources import requests from flask import current_app from flask.cli import with_appcontext @@ -52,11 +52,10 @@ def _load_json_source(filename): - """Load json fixture.""" - source = pkg_resources.resource_filename( - "cds.modules.fixtures", "data/{0}".format(filename) - ) - with open(source, "r") as fp: + """Load JSON fixture.""" + with resources.files("cds.modules.fixtures").joinpath(f"data/{filename}").open( + "r" + ) as fp: content = json.load(fp) return content diff --git a/cds/modules/invenio_deposit/permissions.py b/cds/modules/invenio_deposit/permissions.py index a9f00a9e4..101b0d81d 100644 --- a/cds/modules/invenio_deposit/permissions.py +++ b/cds/modules/invenio_deposit/permissions.py @@ -24,7 +24,7 @@ """Permissions for deposit.""" -import pkg_resources +from importlib import metadata from flask_principal import ActionNeed action_admin_access = ActionNeed("deposit-admin-access") @@ -40,9 +40,9 @@ def admin_permission_factory(): :returns: Permission instance. """ try: - pkg_resources.get_distribution("invenio-access") + metadata.version("invenio-access") from invenio_access.permissions import Permission - except pkg_resources.DistributionNotFound: + except metadata.PackageNotFoundError: from flask_principal import Permission return Permission(action_admin_access) diff --git a/cds/modules/xrootd/ext.py b/cds/modules/xrootd/ext.py index 9ec8c75c7..907c94723 100644 --- a/cds/modules/xrootd/ext.py +++ b/cds/modules/xrootd/ext.py @@ -25,16 +25,15 @@ """Initialization of XRootD.""" -from pkg_resources import DistributionNotFound, get_distribution +from importlib import metadata try: - # Import XRootDPyFS if available so opener gets registered on - # PyFilesystem. - get_distribution("xrootdpyfs") + # Check if xrootdpyfs is installed + metadata.version("xrootdpyfs") import xrootdpyfs # noqa XROOTD_ENABLED = True -except DistributionNotFound: +except metadata.PackageNotFoundError: XROOTD_ENABLED = False xrootdpyfs = None