Merge pull request #168 from CrowdStrike/caracara-0.9.x

Bumps Caracara to the 0.9.x branch and removes setuptools requirement

.github/workflows/code-quality.yml

@@ -15,7 +15,7 @@ jobs:
   codequality:
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v3

falcon_toolkit/common/meta.py

@@ -3,7 +3,9 @@
 This is where all functions and variable setting that are based on application metadata live.
 """
 
-import pkg_resources
+import importlib.metadata
 
-# Derive the version via pkg_resources, which is populated based on the version in pyproject.toml
-__version__ = pkg_resources.get_distribution(__name__.split(".", maxsplit=1)[0]).version
+# Derive the version via importlib.metadata, which is populated based on the version in
+# pyproject.toml. We used to use pkg_resources for this, but using importlib.metadata means
+# that setuptools is no longer required.
+__version__ = importlib.metadata.version("falcon-toolkit")

falcon_toolkit/falcon.py

@@ -48,6 +48,7 @@
     OLD_DEFAULT_CONFIG_DIR,
 )
 from falcon_toolkit.common.logging_config import configure_logger
+from falcon_toolkit.common.meta import __version__
 from falcon_toolkit.common.utils import configure_data_dir
 from falcon_toolkit.containment.cli import cli_containment
 from falcon_toolkit.hosts.cli import cli_host_search
@@ -135,7 +136,10 @@ def cli(
 
     # Configure context that can be passed down to other options
     ctx.ensure_object(dict)
-    click.echo(click.style("Falcon Toolkit", fg="blue", bold=True))
+    click.echo(
+        click.style("Falcon Toolkit", fg="blue", bold=True)
+        + click.style(f" v{__version__}", fg="black", bold=True)
+    )
     hyperlink = build_file_hyperlink(config_path, config_path, "falcon_config_path")
     click.echo(click.style(f"Configuration Directory: {hyperlink}", fg="black"))
     if verbose:

pyproject.toml

@@ -31,7 +31,7 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.9"
-caracara = "^0.8.0"
+caracara = "^0.9.0"
 click = "^8.1.3"
 click-option-group = "^0.5.6"
 click-spinner = "^0.1.10"
@@ -41,7 +41,6 @@ keyring = ">=24,<26"
 platformdirs = "^4.2.0"
 tabulate = "^0.9.0"
 prompt-toolkit = "^3.0.43"
-setuptools = "^69.0"
 
 [tool.poetry.scripts]
 falcon = "falcon_toolkit.falcon:cli"