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/tmp26lnkcv1/netutils",
    "repository_path": "/tmp/tmp26lnkcv1/netutils",
    "dir": "",
    "branch_prefix": "drift-manager/develop",
    "context": {
        "codeowner_github_usernames": "@itdependsnetworks @jeffkala @qduk",
        "full_name": "Network to Code, LLC",
        "email": "[email protected]",
        "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.9",
        "project_with_config_settings": "no",
        "generate_docs": "yes",
        "version": "1.15.1",
        "original_publish_year": "2025",
        "_template": "/__w/cookiecutter-nautobot-app-drift-manager/cookiecutter-nautobot-app-drift-manager/cookiecutter-ntc/python",
        "_output_dir": "/tmp/tmp26lnkcv1",
        "_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": "cb8b5e31dece5ab2663d2ffd218a96ca1ae794c5",
    "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

@@ -23,12 +23,17 @@
             "pull_request_strategy": "update-or-create",
             "post_actions": [],
             "draft": false,
+<<<<<<< HEAD
 <<<<<<< HEAD
             "baked_commit_ref": "cb8b5e31dece5ab2663d2ffd218a96ca1ae794c5"
 =======
             "baked_commit_ref": "6421cae6d80fed91c4ee644ebc19c55adca66e54",
             "drift_managed_branch": "develop"
 >>>>>>> 1476cba (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+            "baked_commit_ref": "b23a9ed5a4714810d83670ad47cc182764c6d464",
+            "drift_managed_branch": "develop"
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
         }
     }
 }

.github/workflows/ci.yml

@@ -107,11 +107,15 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
+<<<<<<< HEAD
 <<<<<<< HEAD
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 =======
         python-version: ["3.10", "3.13"]
 >>>>>>> 1476cba (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+        python-version: ["3.10", "3.13"]
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
     env:
       INVOKE_NETUTILS_PYTHON_VER: "${{ matrix.python-version }}"
     steps:
@@ -147,11 +151,15 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
+<<<<<<< HEAD
 <<<<<<< HEAD
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 =======
         python-version: ["3.10", "3.11", "3.12", "3.13"]
 >>>>>>> 1476cba (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
     runs-on: "ubuntu-latest"
     env:
       INVOKE_NETUTILS_PYTHON_VER: "${{ matrix.python-version }}"
@@ -200,6 +208,7 @@ jobs:
         run: |
           git fetch --no-tags origin +refs/heads/${{ github.base_ref }}:refs/remotes/origin/${{ github.base_ref }}
           poetry run towncrier check --compare-with origin/${{ github.base_ref }}
+<<<<<<< HEAD
 <<<<<<< HEAD
   publish_gh:
     name: "Publish to GitHub"
@@ -299,3 +308,5 @@ jobs:
           SLACK_WEBHOOK_TYPE: "INCOMING_WEBHOOK"
 =======
 >>>>>>> 1476cba (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)

.github/workflows/release.yml

@@ -17,8 +17,11 @@ jobs:
           poetry-version: "2.1.3"
           python-version: "3.13"
           poetry-install-options: "--no-root"
+<<<<<<< HEAD
       - name: "Build Documentation"
         run: "poetry run invoke build-and-check-docs"
+=======
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
       - name: "Run Poetry Build"
         run: "poetry build"
 
@@ -58,18 +61,32 @@ jobs:
     if: "startsWith(github.ref, 'refs/tags/v')"
     needs: "build"
     environment: "pypi"
+<<<<<<< HEAD
     permissions:
       # IMPORTANT: this permission is mandatory for Trusted Publishing
       id-token: "write"
+=======
+    # Steps to publish to PyPI.
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
     steps:
       - name: "Retrieve built package from cache"
         uses: "actions/download-artifact@v4"
         with:
           name: "distfiles"
           path: "dist/"
+<<<<<<< HEAD
 
       - name: "Publish package distributions to PyPI"
         uses: "pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e"  # v1.13.0
+=======
+      - name: "Publish package distributions to PyPI"
+        uses: "pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e"  # v1.13.0
+        ## Used for networktocode org since trusted publisher isn't supported for GitHub Plan.
+        with:
+          user: "__token__"
+          password: "${{ secrets.PYPI_API_TOKEN }}"
+        # End publish to PyPI job.
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 
   slack-notify:
     needs:

README.md

@@ -1,7 +1,10 @@
 # Netutils
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
 =======
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 <!--
 Developer Note - Remove Me!
 
@@ -12,23 +15,31 @@ The logo of the project is a placeholder (docs/images/icon-netutils.png) - pleas
 To avoid extra work and temporary links, make sure that publishing docs (or merging a PR) is done at the same time as setting up the docs site on RTD, then test everything.
 -->
 
+<<<<<<< HEAD
 >>>>>>> 1476cba (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 <p align="center">
   <img src="https://raw.githubusercontent.com/networktocode/netutils/develop/docs/images/icon-Netutils.png" class="logo" height="200px">
   <br>
   <a href="https://github.com/networktocode/netutils/actions"><img src="https://github.com/networktocode/netutils/actions/workflows/ci.yml/badge.svg?branch=main"></a>
+<<<<<<< HEAD
 <<<<<<< HEAD
   <a href="https://netutils.readthedocs.io/en/latest"><img src="https://readthedocs.org/projects/netutils/badge/"></a>
 =======
   <a href="https://netutils.readthedocs.io/en/latest/"><img src="https://readthedocs.org/projects/netutils/badge/"></a>
 >>>>>>> 1476cba (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+  <a href="https://netutils.readthedocs.io/en/latest/"><img src="https://readthedocs.org/projects/netutils/badge/"></a>
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
   <a href="https://pypi.org/project/netutils/"><img src="https://img.shields.io/pypi/v/netutils"></a>
   <a href="https://pypi.org/project/netutils/"><img src="https://img.shields.io/pypi/dm/netutils"></a>
   <br>
 </p>
 
 ## Overview
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 A Python library that is a collection of functions that are used in the common network automation tasks. Tasks such as converting a BGP ASN to and from dotted format, normalizing an interface name, or "type 5" encrypting a password. The intention is to centralize these functions while keeping the library light.
 
@@ -67,6 +78,26 @@ You can find all the Markdown source for the App documentation under the [`docs`
 If you need to view the fully-generated documentation site, you can build it with [MkDocs](https://www.mkdocs.org/). A container hosting the documentation can be started using the `invoke` commands (details in the [Development Environment Guide](https://netutils/dev/dev_environment/#docker-development-environment)) on [http://localhost:8001](http://localhost:8001). Using this container, as your changes to the documentation are saved, they will be automatically rebuilt and any pages currently being viewed will be reloaded in your browser.
 >>>>>>> 1476cba (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 
+=======
+> Developer Note: Add a long (2-3 paragraphs) description of what the library does, what problems it solves, etc.
+
+## Documentation
+
+Full documentation for this library can be found over on the [Netutils Docs](https://netutils.readthedocs.io/) website:
+
+- [User Guide](https://netutils.readthedocs.io/user/app_overview/) - Overview, Using the Library, Getting Started.
+- [Administrator Guide](https://netutils.readthedocs.io/admin/install/) - How to Install, Configure, Upgrade, or Uninstall the Library.
+- [Developer Guide](https://netutils.readthedocs.io/dev/contributing/) - Extending the Library, Code Reference, Contribution Guide.
+- [Release Notes / Changelog](https://netutils.readthedocs.io/admin/release_notes/).
+- [Frequently Asked Questions](https://netutils.readthedocs.io/user/faq/).
+
+### Contributing to the Documentation
+
+You can find all the Markdown source for the App documentation under the [`docs`](https://github.com/networktocode/netutils/tree/develop/docs) folder in this repository. For simple edits, a Markdown capable editor is sufficient: clone the repository and edit away.
+
+If you need to view the fully-generated documentation site, you can build it with [MkDocs](https://www.mkdocs.org/). A container hosting the documentation can be started using the `invoke` commands (details in the [Development Environment Guide](https://netutils/dev/dev_environment/#docker-development-environment)) on [http://localhost:8001](http://localhost:8001). Using this container, as your changes to the documentation are saved, they will be automatically rebuilt and any pages currently being viewed will be reloaded in your browser.
+
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 Any PRs with fixes or improvements are very welcome!
 
 ## Questions

docs/admin/release_notes/version_1.0.md

@@ -6,18 +6,23 @@
 - Commit to SemVer
 - F5 fixes
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 ## v1.0.0 - 2021-11
 =======
 ## [v1.0.0] - 2026-01-09
 >>>>>>> 1476cba (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+## [v1.0.0] - 2026-01-09
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 
 ### Added
 
 - [#69](https://github.com/networktocode/netutils/issues/69) Normalise banner delimiter for IOS to ^C & support parsing delimiter ^.
 
 ### Fixed
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 - [#79](https://github.com/networktocode/netutils/issues/79) F5 parser fix for irules with multiline single command lines.
 
@@ -27,3 +32,6 @@
 =======
 - [#123](https://github.com/networktocode/netutils/issues/123) Fixed Tag filtering not working in job launch form.
 >>>>>>> 1476cba (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+- [#123](https://github.com/networktocode/netutils/issues/123) Fixed Tag filtering not working in job launch form.
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)

docs/dev/contributing.md

@@ -109,11 +109,15 @@ The branching policy includes the following tenets:
 - PRs intended to address bug fixes and security patches should be sourced from the develop branch.
 - PRs intended to add new features that break backward compatibility should be discussed before a PR is created.
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 Netutils will observe semantic versioning, as of 1.0. This may result in an quick turn around in minor versions to keep pace with an ever growing feature set.
 =======
 Netutils will observe Semantic Versioning, as of 1.0. This may result in an quick turn around in minor versions to keep pace with an ever growing feature set.
 >>>>>>> 1476cba (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+Netutils will observe Semantic Versioning, as of 1.0. This may result in an quick turn around in minor versions to keep pace with an ever growing feature set.
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 
 ## Release Policy
 

pyproject.toml

@@ -4,12 +4,18 @@ version = "1.15.2a0"
 description = "Common helper functions useful in network automation."
 authors = ["Network to Code, LLC <[email protected]>"]
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
 =======
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 readme = "README.md"
 homepage = "https://netutils.readthedocs.io/"
 repository = "https://github.com/networktocode/netutils"
 documentation = "https://netutils.readthedocs.io/"
+<<<<<<< HEAD
 >>>>>>> 1476cba (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 license = "Apache-2.0"
 homepage = "https://netutils.readthedocs.io"
 repository = "https://github.com/networktocode/netutils"
@@ -34,6 +40,7 @@ include = [
 [tool.poetry.dependencies]
 python = ">=3.9,<3.14"
 <<<<<<< HEAD
+<<<<<<< HEAD
 napalm = {version = "^4.0.0", optional = true}
 jsonschema = {version = "^4.17.3", optional = true}
 legacycrypt = {version = "0.3", optional = true}
@@ -45,11 +52,16 @@ optionals = ["jsonschema", "napalm", "legacycrypt"]
 coverage = "*"
 invoke = "*"
 =======
+=======
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 click = "*"
 
 [tool.poetry.group.dev.dependencies]
 coverage = "*"
+<<<<<<< HEAD
 >>>>>>> 1476cba (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 pytest = "*"
 mock = "*"
 mypy = "*"

tests/unit/test_basics.py

@@ -1,8 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 """Basic tests that do not require netutils."""
 =======
 """Basic tests that do not require Netutils."""
 >>>>>>> 1476cba (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
+=======
+"""Basic tests that do not require Netutils."""
+>>>>>>> 35e1395 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 
 import os
 import re