From 0b64604eb9a370267aaca2a045378a2db5eaebcb Mon Sep 17 00:00:00 2001 From: Eric Lin Date: Thu, 16 Jul 2020 17:29:11 -0400 Subject: Added type annotations for fields in cmd2.Cmd. Cleaned up docstring in external test plugin Updated some initialization to match new approach for version info discovery. Tagged some IDE-only lines as no-cover Adds plugin coverage reporting. --- plugins/template/cmd2_myplugin/__init__.py | 13 +++++++++---- plugins/template/cmd2_myplugin/myplugin.py | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'plugins/template') diff --git a/plugins/template/cmd2_myplugin/__init__.py b/plugins/template/cmd2_myplugin/__init__.py index 41f0b9cc..e66b62cd 100644 --- a/plugins/template/cmd2_myplugin/__init__.py +++ b/plugins/template/cmd2_myplugin/__init__.py @@ -5,11 +5,16 @@ An overview of what myplugin does. """ -from pkg_resources import get_distribution, DistributionNotFound - from .myplugin import empty_decorator, MyPluginMixin # noqa: F401 try: - __version__ = get_distribution(__name__).version -except DistributionNotFound: + # For python 3.8 and later + import importlib.metadata as importlib_metadata +except ImportError: # pragma: no cover + # For everyone else + import importlib_metadata +try: + __version__ = importlib_metadata.version(__name__) +except importlib_metadata.PackageNotFoundError: # pragma: no cover + # package is not installed __version__ = 'unknown' diff --git a/plugins/template/cmd2_myplugin/myplugin.py b/plugins/template/cmd2_myplugin/myplugin.py index 5fa12caf..4f1ff0e9 100644 --- a/plugins/template/cmd2_myplugin/myplugin.py +++ b/plugins/template/cmd2_myplugin/myplugin.py @@ -7,7 +7,7 @@ from typing import Callable, TYPE_CHECKING import cmd2 -if TYPE_CHECKING: +if TYPE_CHECKING: # pragma: no cover _Base = cmd2.Cmd else: _Base = object -- cgit v1.2.1