Skip to content

Maintenance renovation of dtool-cli #6

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

Draft
pastewka wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Maintenance renovation of dtool-cli #6

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
37 changes: 34 additions & 3 deletions dtool_cli/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import os
import logging

from pkg_resources import iter_entry_points
from importlib.metadata import entry_points

import click
from click_plugins import with_plugins
Expand All @@ -22,6 +22,36 @@
CONFIG_PATH = os.path.expanduser("~/.config/dtool/dtool.json")


def iter_entry_points(group):
"""Iterate over entry points for a given group.

Compatibility wrapper for different Python versions.
"""
eps = entry_points()
if hasattr(eps, 'select'):
# Python 3.10+ / importlib_metadata >= 3.6
return eps.select(group=group)
else:
# Python 3.9 and earlier - eps is a dict
return eps.get(group, [])


def get_entry_point_module(ep):
"""Get the module name from an entry point.

Handles both old and new style entry points.
"""
if hasattr(ep, 'module'):
# importlib.metadata style
return ep.module
elif hasattr(ep, 'value'):
# importlib.metadata style - value is like "module:attr"
return ep.value.split(":")[0]
else:
# Fallback
return str(ep).split("=")[1].strip().split(":")[0]


def storagebroker_validation(ctx, param, value):
storage_broker_lookup = dtoolcore._generate_storage_broker_lookup()
if value not in storage_broker_lookup:
Expand Down Expand Up @@ -96,7 +126,8 @@ def pretty_version_text():
# List the storage broker packages.
version_lines.append("\nStorage brokers:")
for ep in iter_entry_points("dtool.storage_brokers"):
package = ep.module_name.split(".")[0]
module_name = get_entry_point_module(ep)
package = module_name.split(".")[0]
dyn_load_p = __import__(package)
version = dyn_load_p.__version__
storage_broker = ep.load()
Expand All @@ -107,7 +138,7 @@ def pretty_version_text():
version))

# List the plugin packages.
modules = [ep.module_name for ep in iter_entry_points("dtool.cli")]
modules = [get_entry_point_module(ep) for ep in iter_entry_points("dtool.cli")]
packages = set([m.split(".")[0] for m in modules])
version_lines.append("\nPlugins:")
for p in packages:
Expand Down