From 8d51840518fc0a4910206d6a10a3c6b1b2ef3cfa Mon Sep 17 00:00:00 2001 From: bakebot Date: Thu, 12 Feb 2026 17:03:49 +0000 Subject: [PATCH] Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool Template: ``` { "template": "https://github.com/networktocode-llc/cookiecutter-ntc.git", "dir": "python", "ref": "main", "path": "/__w/cookiecutter-nautobot-app-drift-manager/cookiecutter-nautobot-app-drift-manager/cookiecutter-ntc/python" } ``` Cookie: ``` { "remote": "https://github.com/networktocode/netutils.git", "path": "/tmp/tmp8yy2e_dd/netutils", "repository_path": "/tmp/tmp8yy2e_dd/netutils", "dir": "", "branch_prefix": "drift-manager/develop", "context": { "codeowner_github_usernames": "@itdependsnetworks @jeffkala @qduk", "full_name": "Network to Code, LLC", "email": "info@networktocode.com", "github_org": "networktocode", "description": "Common helper functions useful in network automation.", "project_name": "netutils", "project_slug": "netutils", "repo_url": "https://github.com/networktocode/netutils", "base_url": "netutils", "project_python_name": "netutils", "project_python_base_version": "3.10", "project_with_config_settings": "no", "generate_docs": "yes", "version": "1.15.1", "original_publish_year": "2021", "_template": "/__w/cookiecutter-nautobot-app-drift-manager/cookiecutter-nautobot-app-drift-manager/cookiecutter-ntc/python", "_output_dir": "/tmp/tmp8yy2e_dd", "_repo_dir": "/__w/cookiecutter-nautobot-app-drift-manager/cookiecutter-nautobot-app-drift-manager/cookiecutter-ntc/python", "_checkout": null }, "drift_managed_branch": "develop", "remote_name": "origin", "pull_request_strategy": "PullRequestStrategy.UPDATE_OR_CREATE", "post_actions": [], "baked_commit_ref": "b23a9ed5a4714810d83670ad47cc182764c6d464", "draft": false } ``` CLI Arguments: ``` { "cookie_dir": "", "input": false, "json_filename": "", "output_dir": "", "push": true, "template": "./cookiecutter-ntc", "template_dir": "python", "template_ref": "main", "pull_request": "update-or-create", "post_action": [], "disable_post_actions": true, "draft": null, "drift_managed_branch": "develop" } ``` --- .cookiecutter.json | 4 ++++ LICENSE | 4 ++++ changes/+main.housekeeping | 1 + docs/admin/release_notes/version_1.0.md | 4 ++++ example.invoke.yml | 2 +- pyproject.toml | 4 ++++ tasks.py | 7 ++++--- 7 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 changes/+main.housekeeping diff --git a/.cookiecutter.json b/.cookiecutter.json index fd87fa73..c184d8bb 100644 --- a/.cookiecutter.json +++ b/.cookiecutter.json @@ -23,7 +23,11 @@ "pull_request_strategy": "update-or-create", "post_actions": [], "draft": false, +<<<<<<< HEAD "baked_commit_ref": "b23a9ed5a4714810d83670ad47cc182764c6d464", +======= + "baked_commit_ref": "a996428068385caa4a089ec4abfd1ac731fca674", +>>>>>>> 016b1ed (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool) "drift_managed_branch": "develop" } } diff --git a/LICENSE b/LICENSE index 6ce362fa..dd536f54 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,10 @@ Apache Software License 2.0 +<<<<<<< HEAD Copyright (c) 2021-2025, Network to Code, LLC +======= +Copyright (c) 2021-2026, Network to Code, LLC +>>>>>>> 016b1ed (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/changes/+main.housekeeping b/changes/+main.housekeeping new file mode 100644 index 00000000..3433adf6 --- /dev/null +++ b/changes/+main.housekeeping @@ -0,0 +1 @@ +Rebaked from the cookie `main`. diff --git a/docs/admin/release_notes/version_1.0.md b/docs/admin/release_notes/version_1.0.md index 63ef2244..9710b545 100644 --- a/docs/admin/release_notes/version_1.0.md +++ b/docs/admin/release_notes/version_1.0.md @@ -6,7 +6,11 @@ - Commit to SemVer - F5 fixes +<<<<<<< HEAD ## v1.0.0 - 2021-11 +======= +## [v1.0.0] - 2026-02-12 +>>>>>>> 016b1ed (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool) ### Added diff --git a/example.invoke.yml b/example.invoke.yml index 199f8277..6206b5f9 100644 --- a/example.invoke.yml +++ b/example.invoke.yml @@ -1,6 +1,6 @@ --- "netutils": - python_ver: "3.9" + python_ver: "3.10" local: false # image_name: "netutils" # image_ver: "latest" diff --git a/pyproject.toml b/pyproject.toml index d8384cfa..af49011b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,12 +26,16 @@ include = [ [tool.poetry.dependencies] python = ">=3.10,<3.14" +<<<<<<< HEAD napalm = {version = "^4.0.0", optional = true} jsonschema = {version = "^4.17.3", optional = true} legacycrypt = {version = "0.3", optional = true} [tool.poetry.extras] optionals = ["jsonschema", "napalm", "legacycrypt"] +======= +click = "*" +>>>>>>> 016b1ed (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool) [tool.poetry.group.dev.dependencies] coverage = "*" diff --git a/tasks.py b/tasks.py index 84805a24..86acbe74 100644 --- a/tasks.py +++ b/tasks.py @@ -66,13 +66,14 @@ def task_wrapper(function=None): return task_wrapper -def run_command(context, exec_cmd, port=None): +def run_command(context, exec_cmd, port=None, rm=True): """Wrapper to run the invoke task commands. Args: context ([invoke.task]): Invoke task object. exec_cmd ([str]): Command to run. port (int): Used to serve local docs. + rm (bool): Whether to remove the container after running the command. Returns: result (obj): Contains Invoke result from running task. @@ -86,12 +87,12 @@ def run_command(context, exec_cmd, port=None): ) if port: result = context.run( - f"docker run -it -p {port} -v {context.netutils.pwd}:/local {context.netutils.image_name}:{context.netutils.image_ver} sh -c '{exec_cmd}'", + f"docker run -it {'--rm' if rm else ''} -p {port} -v {context.netutils.pwd}:/local {context.netutils.image_name}:{context.netutils.image_ver} sh -c '{exec_cmd}'", pty=True, ) else: result = context.run( - f"docker run -it -v {context.netutils.pwd}:/local {context.netutils.image_name}:{context.netutils.image_ver} sh -c '{exec_cmd}'", + f"docker run -it {'--rm' if rm else ''} -v {context.netutils.pwd}:/local {context.netutils.image_name}:{context.netutils.image_ver} sh -c '{exec_cmd}'", pty=True, )