Skip to content

chore: replace pkg_resources with importlib #2125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zzacharo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: replace pkg_resources with importlib #2125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions cds/modules/fixtures/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions cds/modules/invenio_deposit/permissions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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)
9 changes: 4 additions & 5 deletions cds/modules/xrootd/ext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading