From b3f0f7a3ed7474a2d2ab7f3f86de77c4c5428715 Mon Sep 17 00:00:00 2001 From: Sebastian Lenzlinger Date: Mon, 1 Jul 2024 18:29:51 +0200 Subject: [PATCH] Add missing dependency 'click-option-group' --- code/iottb-project/iottb/main.py | 5 +++-- code/iottb-project/poetry.lock | 36 +++++++++++++++++-------------- code/iottb-project/pyproject.toml | 1 + 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/code/iottb-project/iottb/main.py b/code/iottb-project/iottb/main.py index acba6dd..48ca9cf 100644 --- a/code/iottb-project/iottb/main.py +++ b/code/iottb-project/iottb/main.py @@ -37,13 +37,14 @@ logger = logging.getLogger(__name__) help='Set verbosity') @click.option('-d', '--debug', is_flag=True, default=False, is_eager=True, help='Enable debug mode') -@click.option('--dry-run', is_flag=True, default=True, is_eager=True) +@click.option('--dry-run', is_flag=False, default=True, is_eager=True, help='NOT USED!') @click.option('--cfg-file', type=click.Path(), default=Path(click.get_app_dir(APP_NAME)).joinpath('iottb.cfg'), envvar='IOTTB_CONF_HOME', help='Path to iottb config file') @click.pass_context def cli(ctx, verbosity, debug, dry_run, cfg_file): - setup_logging(verbosity, debug) # Setup logging based on the loaded configuration and other options + # Setup logging based on the loaded configuration and other options + setup_logging(verbosity, debug) ctx.ensure_object(dict) # Make sure context is ready for use logger.info("Starting execution.") ctx.obj['CONFIG'] = IottbConfig(cfg_file) # Load configuration directly diff --git a/code/iottb-project/poetry.lock b/code/iottb-project/poetry.lock index b23fb0e..8b9f65e 100644 --- a/code/iottb-project/poetry.lock +++ b/code/iottb-project/poetry.lock @@ -14,6 +14,25 @@ files = [ [package.dependencies] colorama = {version = "*", markers = "platform_system == \"Windows\""} +[[package]] +name = "click-option-group" +version = "0.5.6" +description = "Option groups missing in Click" +optional = false +python-versions = ">=3.6,<4" +files = [ + {file = "click-option-group-0.5.6.tar.gz", hash = "sha256:97d06703873518cc5038509443742b25069a3c7562d1ea72ff08bfadde1ce777"}, + {file = "click_option_group-0.5.6-py3-none-any.whl", hash = "sha256:38a26d963ee3ad93332ddf782f9259c5bdfe405e73408d943ef5e7d0c3767ec7"}, +] + +[package.dependencies] +Click = ">=7.0,<9" + +[package.extras] +docs = ["Pallets-Sphinx-Themes", "m2r2", "sphinx"] +tests = ["pytest"] +tests-cov = ["coverage", "coveralls", "pytest", "pytest-cov"] + [[package]] name = "colorama" version = "0.4.6" @@ -82,22 +101,7 @@ pluggy = ">=1.5,<2.0" [package.extras] dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] -[[package]] -name = "scapy" -version = "2.5.0" -description = "Scapy: interactive packet manipulation tool" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4" -files = [ - {file = "scapy-2.5.0.tar.gz", hash = "sha256:5b260c2b754fd8d409ba83ee7aee294ecdbb2c235f9f78fe90bc11cb6e5debc2"}, -] - -[package.extras] -basic = ["ipython"] -complete = ["cryptography (>=2.0)", "ipython", "matplotlib", "pyx"] -docs = ["sphinx (>=3.0.0)", "sphinx_rtd_theme (>=0.4.3)", "tox (>=3.0.0)"] - [metadata] lock-version = "2.0" python-versions = "^3.12" -content-hash = "10b2c268b0f10db15eab2cca3d2dc9dc25bc60f4b218ebf786fb780fa85557e0" +content-hash = "05aa11a74b8a6411a4413684f1a4cb0e5bcd271e16b4de9ae5205d52232c91a3" diff --git a/code/iottb-project/pyproject.toml b/code/iottb-project/pyproject.toml index 9343dba..9aa6482 100644 --- a/code/iottb-project/pyproject.toml +++ b/code/iottb-project/pyproject.toml @@ -9,6 +9,7 @@ readme = "README.md" python = "^3.12" click = "^8.1" # scapy = "^2.5" +click-option-group = "^0.5.6" [tool.poetry.scripts] iottb = "iottb.main:cli"