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/tmp8oss3l1r/netutils",
    "repository_path": "/tmp/tmp8oss3l1r/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/tmp8oss3l1r",
        "_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"
}
```

Author: bakebot

.cookiecutter.json

@@ -24,6 +24,7 @@
             "post_actions": [],
             "draft": false,
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             "baked_commit_ref": "b23a9ed5a4714810d83670ad47cc182764c6d464",
 =======
@@ -32,6 +33,9 @@
 =======
             "baked_commit_ref": "7af44cb7e9a8e4894c9edfd2ee6ad8dc7b109de2",
 >>>>>>> 3ab07dc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+            "baked_commit_ref": "46f70d30baa1e0c5af3da3fdcf1c77b31157d3f9",
+>>>>>>> 67a15b6 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
             "drift_managed_branch": "develop"
         }
     }

.github/workflows/ci.yml

@@ -134,11 +134,15 @@ jobs:
           cache-from: "type=gha,scope=${{ env.INVOKE_NETUTILS_IMAGE_NAME }}-${{ env.INVOKE_NETUTILS_IMAGE_VER }}-py${{ matrix.python-version }}"
           cache-to: "type=gha,scope=${{ env.INVOKE_NETUTILS_IMAGE_NAME }}-${{ env.INVOKE_NETUTILS_IMAGE_VER }}-py${{ matrix.python-version }}"
           build-args: |
+<<<<<<< HEAD
 <<<<<<< HEAD
             PYTHON_VER=${{ matrix.python-version }}
 =======
             PYTHON_VER=${{ env.INVOKE_{{cookiecutter.project_slug | upper}}_PYTHON_VER }}
 >>>>>>> 3ab07dc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+            PYTHON_VER=${{ matrix.python-version }}
+>>>>>>> 67a15b6 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
       - name: "Linting: Pylint"
         run: "poetry run invoke pylint"
   pytest:
@@ -175,11 +179,15 @@ jobs:
           cache-from: "type=gha,scope=${{ env.INVOKE_NETUTILS_IMAGE_NAME }}-${{ env.INVOKE_NETUTILS_IMAGE_VER }}-py${{ matrix.python-version }}"
           cache-to: "type=gha,scope=${{ env.INVOKE_NETUTILS_IMAGE_NAME }}-${{ env.INVOKE_NETUTILS_IMAGE_VER }}-py${{ matrix.python-version }}"
           build-args: |
+<<<<<<< HEAD
 <<<<<<< HEAD
             PYTHON_VER=${{ matrix.python-version }}
 =======
             PYTHON_VER=${{ env.INVOKE_{{cookiecutter.project_slug | upper}}_PYTHON_VER }}
 >>>>>>> 3ab07dc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+            PYTHON_VER=${{ matrix.python-version }}
+>>>>>>> 67a15b6 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
       - name: "Run Tests"
         run: "poetry run invoke pytest"
   changelog:

.github/workflows/release.yml

@@ -1,6 +1,6 @@
 ---
 name: "Release"
-on: # yamllint disable-line rule:truthy rule:comments
+on:  # yamllint disable-line rule:truthy rule:comments
   release:
     types: ["published"]
 
@@ -48,7 +48,7 @@ jobs:
       - name: "Upload binaries to release"
         run: "gh release upload ${{ github.ref_name }} dist/*.{tar.gz,whl}"
         env:
-          GH_TOKEN: "${{ secrets.NTC_GITHUB_TOKEN }}"
+          GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
   publish-pypi:
     name: "Push Package to PyPI"

LICENSE

@@ -1,5 +1,6 @@
 Apache Software License 2.0
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 Copyright (c) 2021-2025, Network to Code, LLC
@@ -9,6 +10,9 @@ Copyright (c) 2021-2026, Network to Code, LLC
 =======
 Copyright (c) 2021-2026, Network to Code, LLC
 >>>>>>> 3ab07dc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+Copyright (c) 2021-2026, Network to Code, LLC
+>>>>>>> 67a15b6 (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.

README.md

@@ -18,6 +18,7 @@ A Python library that is a collection of functions that are used in the common n
 
 Full web-based HTML documentation for this library can be found over on the [Netutils Docs](https://netutils.readthedocs.io) website:
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 - [User Guide](https://netutils.readthedocs.io/en/latest/user/lib_overview/) - Overview, Using the library, Getting Started.
 - [Administrator Guide](https://netutils.readthedocs.io/en/latest/admin/install/) - How to Install, Configure, Upgrade, or Uninstall the library.
@@ -27,6 +28,11 @@ Full web-based HTML documentation for this library can be found over on the [Net
 - [Administrator Guide](https://netutils.readthedocs.io/en/latest/admin/install/) - How to Install, Configure, Upgrade, or Uninstall the Library.
 - [Developer Guide](https://netutils.readthedocs.io/en/latest/dev/contributing/) - Extending the Library, Code Reference, Contribution Guide.
 >>>>>>> 3ab07dc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+- [User Guide](https://netutils.readthedocs.io/en/latest/user/app_overview/) - Overview, Using the Library, Getting Started.
+- [Administrator Guide](https://netutils.readthedocs.io/en/latest/admin/install/) - How to Install, Configure, Upgrade, or Uninstall the Library.
+- [Developer Guide](https://netutils.readthedocs.io/en/latest/dev/contributing/) - Extending the Library, Code Reference, Contribution Guide.
+>>>>>>> 67a15b6 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 - [Release Notes / Changelog](https://netutils.readthedocs.io/en/latest/admin/release_notes/).
 - [Frequently Asked Questions](https://netutils.readthedocs.io/en/latest/user/faq/).
 

docs/admin/release_notes/version_1.0.md

@@ -6,6 +6,7 @@
 - Commit to SemVer
 - F5 fixes
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 ## v1.0.0 - 2021-11
@@ -15,6 +16,9 @@
 =======
 ## [v1.0.0] - 2026-03-03
 >>>>>>> 3ab07dc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+## [v1.0.0] - 2026-03-03
+>>>>>>> 67a15b6 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 
 ### Added
 

pyproject.toml

@@ -28,6 +28,7 @@ include = [
 python = ">=3.10,<3.14"
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 napalm = {version = "^4.0.0", optional = true}
 jsonschema = {version = "^4.17.3", optional = true}
 legacycrypt = {version = "0.3", optional = true}
@@ -37,6 +38,8 @@ optionals = ["jsonschema", "napalm", "legacycrypt"]
 =======
 =======
 >>>>>>> 3ab07dc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+>>>>>>> 67a15b6 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 click = "*"
 >>>>>>> 016b1ed (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 

tasks.py

@@ -199,6 +199,16 @@ def pytest(context, pattern=None, label=None):
     exec_cmd = " && ".join([doc_test_cmd, pytest_cmd, coverage_cmd])
     run_command(context, exec_cmd)
 
+    doc_test_cmd = "pytest -vv --doctest-modules netutils/"
+    pytest_cmd = "coverage run --source=netutils -m pytest"
+    if pattern:
+        pytest_cmd += "".join([f" -k {_pattern}" for _pattern in pattern])
+    if label:
+        pytest_cmd += "".join([f" {_label}" for _label in label])
+    coverage_cmd = "coverage report"
+    exec_cmd = " && ".join([doc_test_cmd, pytest_cmd, coverage_cmd])
+    run_command(context, exec_cmd)
+
 
 @task(aliases=("a",))
 def autoformat(context):