Skip to content

Commit 7560b3a

Browse files
author
bakebot
committed
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/tmp422crx0_/netutils", "repository_path": "/tmp/tmp422crx0_/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/tmp422crx0_", "_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" } ```
1 parent 8d51840 commit 7560b3a

File tree

7 files changed

+41
-2
lines changed

7 files changed

+41
-2
lines changed

.cookiecutter.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,15 @@
2323
"pull_request_strategy": "update-or-create",
2424
"post_actions": [],
2525
"draft": false,
26+
<<<<<<< HEAD
2627
<<<<<<< HEAD
2728
"baked_commit_ref": "b23a9ed5a4714810d83670ad47cc182764c6d464",
2829
=======
2930
"baked_commit_ref": "a996428068385caa4a089ec4abfd1ac731fca674",
3031
>>>>>>> 016b1ed (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
32+
=======
33+
"baked_commit_ref": "7af44cb7e9a8e4894c9edfd2ee6ad8dc7b109de2",
34+
>>>>>>> 3ab07dc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
3135
"drift_managed_branch": "develop"
3236
}
3337
}

.github/workflows/ci.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,11 @@ jobs:
134134
cache-from: "type=gha,scope=${{ env.INVOKE_NETUTILS_IMAGE_NAME }}-${{ env.INVOKE_NETUTILS_IMAGE_VER }}-py${{ matrix.python-version }}"
135135
cache-to: "type=gha,scope=${{ env.INVOKE_NETUTILS_IMAGE_NAME }}-${{ env.INVOKE_NETUTILS_IMAGE_VER }}-py${{ matrix.python-version }}"
136136
build-args: |
137+
<<<<<<< HEAD
137138
PYTHON_VER=${{ matrix.python-version }}
139+
=======
140+
PYTHON_VER=${{ env.INVOKE_{{cookiecutter.project_slug | upper}}_PYTHON_VER }}
141+
>>>>>>> 3ab07dc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
138142
- name: "Linting: Pylint"
139143
run: "poetry run invoke pylint"
140144
pytest:
@@ -171,7 +175,11 @@ jobs:
171175
cache-from: "type=gha,scope=${{ env.INVOKE_NETUTILS_IMAGE_NAME }}-${{ env.INVOKE_NETUTILS_IMAGE_VER }}-py${{ matrix.python-version }}"
172176
cache-to: "type=gha,scope=${{ env.INVOKE_NETUTILS_IMAGE_NAME }}-${{ env.INVOKE_NETUTILS_IMAGE_VER }}-py${{ matrix.python-version }}"
173177
build-args: |
178+
<<<<<<< HEAD
174179
PYTHON_VER=${{ matrix.python-version }}
180+
=======
181+
PYTHON_VER=${{ env.INVOKE_{{cookiecutter.project_slug | upper}}_PYTHON_VER }}
182+
>>>>>>> 3ab07dc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
175183
- name: "Run Tests"
176184
run: "poetry run invoke pytest"
177185
changelog:

LICENSE

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
Apache Software License 2.0
22

3+
<<<<<<< HEAD
34
<<<<<<< HEAD
45
Copyright (c) 2021-2025, Network to Code, LLC
56
=======
67
Copyright (c) 2021-2026, Network to Code, LLC
78
>>>>>>> 016b1ed (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
9+
=======
10+
Copyright (c) 2021-2026, Network to Code, LLC
11+
>>>>>>> 3ab07dc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
812

913
Licensed under the Apache License, Version 2.0 (the "License");
1014
you may not use this file except in compliance with the License.

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Netutils
22

33
<p align="center">
4-
<img src="https://raw.githubusercontent.com/networktocode/netutils/develop/docs/images/icon-Netutils.png" class="logo" height="200px">
4+
<img src="https://raw.githubusercontent.com/networktocode/netutils/develop/docs/images/netutils_logo.png" class="logo" height="200px">
55
<br>
66
<a href="https://github.com/networktocode/netutils/actions"><img src="https://github.com/networktocode/netutils/actions/workflows/ci.yml/badge.svg?branch=main"></a>
77
<a href="https://netutils.readthedocs.io/en/latest"><img src="https://readthedocs.org/projects/netutils/badge/"></a>
@@ -18,9 +18,15 @@ A Python library that is a collection of functions that are used in the common n
1818

1919
Full web-based HTML documentation for this library can be found over on the [Netutils Docs](https://netutils.readthedocs.io) website:
2020

21+
<<<<<<< HEAD
2122
- [User Guide](https://netutils.readthedocs.io/en/latest/user/lib_overview/) - Overview, Using the library, Getting Started.
2223
- [Administrator Guide](https://netutils.readthedocs.io/en/latest/admin/install/) - How to Install, Configure, Upgrade, or Uninstall the library.
2324
- [Developer Guide](https://netutils.readthedocs.io/en/latest/dev/contributing/) - Extending the library, Code Reference, Contribution Guide.
25+
=======
26+
- [User Guide](https://netutils.readthedocs.io/en/latest/user/app_overview/) - Overview, Using the Library, Getting Started.
27+
- [Administrator Guide](https://netutils.readthedocs.io/en/latest/admin/install/) - How to Install, Configure, Upgrade, or Uninstall the Library.
28+
- [Developer Guide](https://netutils.readthedocs.io/en/latest/dev/contributing/) - Extending the Library, Code Reference, Contribution Guide.
29+
>>>>>>> 3ab07dc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
2430
- [Release Notes / Changelog](https://netutils.readthedocs.io/en/latest/admin/release_notes/).
2531
- [Frequently Asked Questions](https://netutils.readthedocs.io/en/latest/user/faq/).
2632

docs/admin/release_notes/version_1.0.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@
66
- Commit to SemVer
77
- F5 fixes
88

9+
<<<<<<< HEAD
910
<<<<<<< HEAD
1011
## v1.0.0 - 2021-11
1112
=======
1213
## [v1.0.0] - 2026-02-12
1314
>>>>>>> 016b1ed (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
15+
=======
16+
## [v1.0.0] - 2026-03-03
17+
>>>>>>> 3ab07dc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
1418
1519
### Added
1620

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,16 @@ include = [
2727
[tool.poetry.dependencies]
2828
python = ">=3.10,<3.14"
2929
<<<<<<< HEAD
30+
<<<<<<< HEAD
3031
napalm = {version = "^4.0.0", optional = true}
3132
jsonschema = {version = "^4.17.3", optional = true}
3233
legacycrypt = {version = "0.3", optional = true}
3334

3435
[tool.poetry.extras]
3536
optionals = ["jsonschema", "napalm", "legacycrypt"]
3637
=======
38+
=======
39+
>>>>>>> 3ab07dc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
3740
click = "*"
3841
>>>>>>> 016b1ed (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
3942

tasks.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def is_truthy(arg):
3939
"python_ver": "3.10",
4040
"local": is_truthy(os.getenv("INVOKE_NETUTILS_LOCAL", "false")),
4141
"image_name": "netutils",
42-
"image_ver": os.getenv("INVOKE_PARSER_IMAGE_VER", "latest"),
42+
"image_ver": os.getenv("INVOKE_NETUTILS_IMAGE_VER", "latest"),
4343
"pwd": Path(__file__).parent,
4444
}
4545
}
@@ -189,6 +189,16 @@ def pytest(context, pattern=None, label=None):
189189
exec_cmd = " && ".join([doc_test_cmd, pytest_cmd, coverage_cmd])
190190
run_command(context, exec_cmd)
191191

192+
doc_test_cmd = "pytest -vv --doctest-modules netutils/"
193+
pytest_cmd = "coverage run --source=netutils -m pytest"
194+
if pattern:
195+
pytest_cmd += "".join([f" -k {_pattern}" for _pattern in pattern])
196+
if label:
197+
pytest_cmd += "".join([f" {_label}" for _label in label])
198+
coverage_cmd = "coverage report"
199+
exec_cmd = " && ".join([doc_test_cmd, pytest_cmd, coverage_cmd])
200+
run_command(context, exec_cmd)
201+
192202

193203
@task(aliases=("a",))
194204
def autoformat(context):

0 commit comments

Comments
 (0)