Skip to content

Commit 0cf7670

Browse files
smith-ntcbakebotjeffkala
authored
Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool (#330)
* 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/diffsync.git", "path": "/tmp/tmpn08h9047/diffsync", "repository_path": "/tmp/tmpn08h9047/diffsync", "dir": "", "branch_prefix": "drift-manager/develop", "context": { "codeowner_github_usernames": "@glennmatthews @michalis1 @jdrew82", "full_name": "Network to Code, LLC", "email": "info@networktocode.com", "github_org": "networktocode", "description": "Library to easily sync/diff/update 2 different data sources", "project_name": "diffsync", "project_slug": "diffsync", "repo_url": "https://github.com/networktocode/diffsync", "base_url": "diffsync", "project_python_name": "diffsync", "project_python_base_version": "3.10", "project_with_config_settings": "no", "generate_docs": "yes", "version": "2.2.0", "original_publish_year": "2025", "_template": "/__w/cookiecutter-nautobot-app-drift-manager/cookiecutter-nautobot-app-drift-manager/cookiecutter-ntc/python", "_output_dir": "/tmp/tmpn08h9047", "_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": "bc789d65fa90182c0eb392664e1cba02ea187ab1", "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" } ``` * fix merge conflicts --------- Co-authored-by: bakebot <info@networktocode.com> Co-authored-by: Jeff Kala <Jeff.kala@networktocode.com>
1 parent 5780050 commit 0cf7670

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.cookiecutter.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
"project_with_config_settings": "no",
1515
"generate_docs": "yes",
1616
"version": "2.2.0",
17-
"original_publish_year": "2025",
17+
"original_publish_year": "2020",
1818
"_drift_manager": {
19-
"template": "git@github.com:networktocode-llc/cookiecutter-ntc.git",
19+
"template": "https://github.com/networktocode-llc/cookiecutter-ntc.git",
2020
"template_dir": "python",
2121
"template_ref": "main",
2222
"cookie_dir": "",
23-
"pull_request_strategy": "create",
23+
"pull_request_strategy": "update-or-create",
2424
"post_actions": [],
2525
"draft": false,
26-
"baked_commit_ref": "bc789d65fa90182c0eb392664e1cba02ea187ab1",
26+
"baked_commit_ref": "67d15ddeb638efb7c39ab746e97e7b9c96c16801",
2727
"drift_managed_branch": "develop"
2828
}
2929
}

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@ jobs:
1717
poetry-version: "2.1.3"
1818
python-version: "3.13"
1919
poetry-install-options: "--no-root"
20-
- name: "Build Documentation"
21-
run: "poetry run invoke build build-and-check-docs"
2220
- name: "Run Poetry Build"
2321
run: "poetry build"
24-
2522
- name: "Check that the release tag matches the version in pyproject.toml"
2623
run: |
2724
if [ "${{ github.ref_name }}" != "v$(poetry version -s)" ]; then exit 1; fi
@@ -58,17 +55,20 @@ jobs:
5855
if: "startsWith(github.ref, 'refs/tags/v')"
5956
needs: "build"
6057
environment: "pypi"
58+
# Steps to publish to PyPI.
6159
steps:
6260
- name: "Retrieve built package from cache"
6361
uses: "actions/download-artifact@v4"
6462
with:
6563
name: "distfiles"
6664
path: "dist/"
67-
- name: "Publish package distribution to PyPI"
65+
- name: "Publish package distributions to PyPI"
6866
uses: "pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e" # v1.13.0
67+
## Used for networktocode org since trusted publisher isn't supported for GitHub Plan.
6968
with:
7069
user: "__token__"
7170
password: "${{ secrets.PYPI_API_TOKEN }}"
71+
# End publish to PyPI job.
7272

7373
slack-notify:
7474
needs:

changes/+main.housekeeping

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Rebaked from the cookie `main`.

0 commit comments

Comments
 (0)