Merge pull request #832 from andrew-glenn/main

Fixing poetry configs, removing reliance on pkg_resources

pyproject.toml

@@ -3,12 +3,18 @@ version = "0.9.51"
 authors = ["Andrew Glenn", "Jay McConnell", "Shivansh Singh", "Tony Vattathil"]
 description = "An OpenSource Cloudformation Deployment Framework"
 name = "taskcat"
+
+[tool.poetry.scripts]
+taskcat = "taskcat._cli:main"
+
 [tool.portray.mkdocs.theme]
 favicon = "https://raw.githubusercontent.com/aws-ia/taskcat/main/assets/docs/images/tcat.png"
 logo = "https://raw.githubusercontent.com/aws-ia/taskcat/main/assets/docs/images/tcat.png"
 name = "material"
 palette = {primary = "black", accent = "orange"}
 
+
+
 [tool.portray.mkdocs]
 extra_css = ['docs/custom.css']
 

taskcat/_cli.py

@@ -1,9 +1,9 @@
+import importlib.metadata
 import signal
 import sys
 
 import requests
 
-from pkg_resources import get_distribution
 from taskcat._cli_core import GLOBAL_ARGS, CliCore, _get_log_level
 from taskcat._common_utils import exit_with_code
 from taskcat._logger import PrintMsg, init_taskcat_cli_logger
@@ -116,10 +116,7 @@ def get_pip_version(url):
 
 
 def get_installed_version():
-    try:
-        return get_distribution(NAME).version
-    except Exception:  # pylint: disable=broad-except
-        return "[local source] no pip module installed"
+    return importlib.metadata.version(__package__ or __name__)
 
 
 def _sigint_handler(signum, frame):

tests/test_cli.py

@@ -69,15 +69,6 @@ def test_setup_logging(self, m_exit, m_setLevel):
         _setup_logging(["-d", "-q"], exit_func=m_exit)
         self.assertEqual(True, m_exit.called)
 
-    @mock.patch("taskcat._cli.get_distribution", autospec=True)
-    def test_check_for_update(self, mock_get_distribution):
-        mock_get_distribution.return_value.version = "0.1.0"
-        check_for_update()
-        self.assertEqual(mock_get_distribution.call_count, 1)
-        mock_get_distribution.side_effect = TypeError("test")
-        check_for_update()
-        self.assertEqual(mock_get_distribution.call_count, 2)
-
     @mock.patch("taskcat._cli.LOG", autospec=True)
     def test__print_upgrade_msg(self, mock_log):
         _print_upgrade_msg("0.1.0", "0.0.1")