Skip to content

Commit cdf223d

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/tmp75f6urcc/netutils", "repository_path": "/tmp/tmp75f6urcc/netutils", "dir": "", "branch_prefix": "drift-manager/develop", "context": { "codeowner_github_usernames": "@itdependsnetworks @jeffkala", "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/tmp75f6urcc", "_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": "e4d0e9bd14396e92e7cc2699a9afe91ca5946468", "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 3f3dd7c commit cdf223d

3 files changed

Lines changed: 12 additions & 0 deletions

File tree

‎.cookiecutter.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"post_actions": [],
2525
"draft": false,
2626
<<<<<<< HEAD
27+
<<<<<<< HEAD
2728
<<<<<<< HEAD
2829
"baked_commit_ref": "e4d0e9bd14396e92e7cc2699a9afe91ca5946468",
2930
=======
@@ -32,6 +33,9 @@
3233
=======
3334
"baked_commit_ref": "de952226ae0b53c8f40fbab18f65a13c3b81ad11",
3435
>>>>>>> 26305bc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
36+
=======
37+
"baked_commit_ref": "c259553023c359845e9955117f81d790c44d453f",
38+
>>>>>>> 7a88450 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
3539
"drift_managed_branch": "develop"
3640
}
3741
}

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,17 @@ jobs:
2121
with:
2222
poetry-version: "${{ env.POETRY_VERSION }}"
2323
python-version: "${{ env.PYTHON_VERSION }}"
24+
<<<<<<< HEAD
2425
<<<<<<< HEAD
2526
poetry-install-options: "--only dev,docs"
2627
- name: "Build Documentation"
2728
run: "poetry run invoke build-and-check-docs"
2829
=======
2930
poetry-install-options: "--no-root"
3031
>>>>>>> 26305bc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
32+
=======
33+
poetry-install-options: "--with dev,docs"
34+
>>>>>>> 7a88450 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
3135
- name: "Run Poetry Build"
3236
run: "poetry build"
3337

‎docs/admin/release_notes/version_1.0.md‎

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

9+
<<<<<<< HEAD
910
<<<<<<< HEAD
1011
<<<<<<< HEAD
1112
## v1.0.0 - 2021-11
@@ -15,6 +16,9 @@
1516
=======
1617
## [v1.0.0] - 2026-09-23
1718
>>>>>>> 26305bc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
19+
=======
20+
## [v1.0.0] - 2026-09-23
21+
>>>>>>> 7a88450 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
1822
1923
### Added
2024

0 commit comments

Comments
 (0)