Skip to content

Commit 7cc344b

Browse files
smith-ntcbakebotjeffkala
authored
Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool (#148)
* 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/jdiff.git", "path": "/tmp/tmpgxrdsm7e/jdiff", "repository_path": "/tmp/tmpgxrdsm7e/jdiff", "dir": "", "branch_prefix": "drift-manager/develop", "context": { "codeowner_github_usernames": "@lvrfrc87 @scetron @grelleum @jeffkala @pszulczewski", "full_name": "Network to Code, LLC", "email": "info@networktocode.com", "github_org": "networktocode", "description": "Python library for examining structured data.", "project_name": "jdiff", "project_slug": "jdiff", "repo_url": "https://github.com/networktocode/jdiff", "base_url": "jdiff", "project_python_name": "jdiff", "project_python_base_version": "3.10", "project_with_config_settings": "no", "generate_docs": "yes", "version": "1.0.1", "original_publish_year": "2022", "_template": "/__w/cookiecutter-nautobot-app-drift-manager/cookiecutter-nautobot-app-drift-manager/cookiecutter-ntc/python", "_output_dir": "/tmp/tmpgxrdsm7e", "_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": "", "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" } ``` * initial drift manager conflict and cleanups to get jdiff drift managed * relock poetry * relock poetry * fix image_ver in tasks.py * final fixes for initial back * final fixes for initial back * Update .github/workflows/ci.yml --------- Co-authored-by: bakebot <info@networktocode.com> Co-authored-by: Jeff Kala <Jeff.kala@networktocode.com> Co-authored-by: Jeff Kala <48843785+jeffkala@users.noreply.github.com>
1 parent 5f27089 commit 7cc344b

27 files changed

+937
-809
lines changed

‎.cookiecutter.json‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,17 @@
1414
"project_with_config_settings": "no",
1515
"generate_docs": "yes",
1616
"version": "1.0.1",
17-
"original_publish_year": "2022"
17+
"original_publish_year": "2022",
18+
"_drift_manager": {
19+
"template": "https://github.com/networktocode-llc/cookiecutter-ntc.git",
20+
"template_dir": "python",
21+
"template_ref": "main",
22+
"cookie_dir": "",
23+
"pull_request_strategy": "update-or-create",
24+
"post_actions": [],
25+
"draft": false,
26+
"baked_commit_ref": "bc931311336d391d878202dba239389783ee9f09",
27+
"drift_managed_branch": "develop"
28+
}
1829
}
1930
}

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ about: Report a reproducible bug in the current release of jdiff
44
---
55

66
### Environment
7-
* Python version: <!-- Example: 3.11.2 -->
7+
* Python version: <!-- Example: 3.10 -->
88
* jdiff version: <!-- Example: 1.0.0 -->
99

1010
<!-- What did you expect to happen? -->

‎.github/workflows/ci.yml‎

Lines changed: 31 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ on: # yamllint disable-line rule:truthy rule:comments
88
branches:
99
- "main"
1010
- "develop"
11-
tags:
12-
- "v*"
1311
pull_request: ~
1412

1513
env:
@@ -18,7 +16,7 @@ env:
1816

1917
jobs:
2018
ruff-format:
21-
runs-on: "ubuntu-24.04"
19+
runs-on: "ubuntu-latest"
2220
env:
2321
INVOKE_JDIFF_LOCAL: "True"
2422
steps:
@@ -27,11 +25,11 @@ jobs:
2725
- name: "Setup environment"
2826
uses: "networktocode/gh-action-setup-poetry-environment@v6"
2927
with:
30-
poetry-version: "1.8.5"
28+
poetry-version: "2.1.3"
3129
- name: "Linting: ruff format"
3230
run: "poetry run invoke ruff --action format"
3331
ruff-lint:
34-
runs-on: "ubuntu-24.04"
32+
runs-on: "ubuntu-latest"
3533
env:
3634
INVOKE_JDIFF_LOCAL: "True"
3735
steps:
@@ -40,11 +38,11 @@ jobs:
4038
- name: "Setup environment"
4139
uses: "networktocode/gh-action-setup-poetry-environment@v6"
4240
with:
43-
poetry-version: "1.8.5"
41+
poetry-version: "2.1.3"
4442
- name: "Linting: ruff"
4543
run: "poetry run invoke ruff --action lint"
4644
check-docs-build:
47-
runs-on: "ubuntu-22.04"
45+
runs-on: "ubuntu-latest"
4846
env:
4947
INVOKE_JDIFF_LOCAL: "True"
5048
steps:
@@ -53,11 +51,12 @@ jobs:
5351
- name: "Setup environment"
5452
uses: "networktocode/gh-action-setup-poetry-environment@v6"
5553
with:
56-
poetry-version: "1.8.5"
54+
poetry-version: "2.1.3"
55+
poetry-install-options: "--only dev,docs"
5756
- name: "Check Docs Build"
5857
run: "poetry run invoke build-and-check-docs"
5958
poetry:
60-
runs-on: "ubuntu-24.04"
59+
runs-on: "ubuntu-latest"
6160
env:
6261
INVOKE_JDIFF_LOCAL: "True"
6362
steps:
@@ -66,15 +65,11 @@ jobs:
6665
- name: "Setup environment"
6766
uses: "networktocode/gh-action-setup-poetry-environment@v6"
6867
with:
69-
poetry-version: "1.8.5"
68+
poetry-version: "2.1.3"
7069
- name: "Checking: poetry lock file"
71-
run: "poetry lock --check"
72-
needs:
73-
- "ruff-format"
74-
- "ruff-lint"
75-
- "yamllint"
70+
run: "poetry run invoke lock --check"
7671
yamllint:
77-
runs-on: "ubuntu-24.04"
72+
runs-on: "ubuntu-latest"
7873
env:
7974
INVOKE_JDIFF_LOCAL: "True"
8075
steps:
@@ -83,25 +78,29 @@ jobs:
8378
- name: "Setup environment"
8479
uses: "networktocode/gh-action-setup-poetry-environment@v6"
8580
with:
86-
poetry-version: "1.8.5"
81+
poetry-version: "2.1.3"
8782
- name: "Linting: yamllint"
8883
run: "poetry run invoke yamllint"
84+
check-in-docker:
8985
needs:
9086
- "ruff-format"
9187
- "ruff-lint"
92-
pylint:
93-
runs-on: "ubuntu-24.04"
88+
- "poetry"
89+
- "yamllint"
90+
runs-on: "ubuntu-latest"
9491
strategy:
9592
fail-fast: true
9693
matrix:
97-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
94+
python-version: ["3.10", "3.13"]
9895
env:
99-
PYTHON_VER: "${{ matrix.python-version }}"
96+
INVOKE_JDIFF_PYTHON_VER: "${{ matrix.python-version }}"
10097
steps:
10198
- name: "Check out repository code"
10299
uses: "actions/checkout@v4"
103100
- name: "Setup environment"
104101
uses: "networktocode/gh-action-setup-poetry-environment@v6"
102+
with:
103+
poetry-version: "2.1.3"
105104
- name: "Get image version"
106105
run: "echo INVOKE_JDIFF_IMAGE_VER=`poetry version -s`-py${{ matrix.python-version }} >> $GITHUB_ENV"
107106
- name: "Set up Docker Buildx"
@@ -119,26 +118,26 @@ jobs:
119118
cache-from: "type=gha,scope=${{ env.INVOKE_JDIFF_IMAGE_NAME }}-${{ env.INVOKE_JDIFF_IMAGE_VER }}-py${{ matrix.python-version }}"
120119
cache-to: "type=gha,scope=${{ env.INVOKE_JDIFF_IMAGE_NAME }}-${{ env.INVOKE_JDIFF_IMAGE_VER }}-py${{ matrix.python-version }}"
121120
build-args: |
122-
PYTHON_VER=${{ env.PYTHON_VER }}
123-
- name: "Debug: Show docker images"
124-
run: "docker image ls"
121+
PYTHON_VER=${{ matrix.python-version }}
125122
- name: "Linting: Pylint"
126123
run: "poetry run invoke pylint"
127-
needs:
128-
- "poetry"
129124
pytest:
125+
needs:
126+
- "check-in-docker"
130127
strategy:
131128
fail-fast: true
132129
matrix:
133-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
134-
runs-on: "ubuntu-24.04"
130+
python-version: ["3.10", "3.11", "3.12", "3.13"]
131+
runs-on: "ubuntu-latest"
135132
env:
136-
PYTHON_VER: "${{ matrix.python-version }}"
133+
INVOKE_JDIFF_PYTHON_VER: "${{ matrix.python-version }}"
137134
steps:
138135
- name: "Check out repository code"
139136
uses: "actions/checkout@v4"
140137
- name: "Setup environment"
141138
uses: "networktocode/gh-action-setup-poetry-environment@v6"
139+
with:
140+
poetry-version: "2.1.3"
142141
- name: "Get image version"
143142
run: "echo INVOKE_JDIFF_IMAGE_VER=`poetry version -s`-py${{ matrix.python-version }} >> $GITHUB_ENV"
144143
- name: "Set up Docker Buildx"
@@ -156,18 +155,14 @@ jobs:
156155
cache-from: "type=gha,scope=${{ env.INVOKE_JDIFF_IMAGE_NAME }}-${{ env.INVOKE_JDIFF_IMAGE_VER }}-py${{ matrix.python-version }}"
157156
cache-to: "type=gha,scope=${{ env.INVOKE_JDIFF_IMAGE_NAME }}-${{ env.INVOKE_JDIFF_IMAGE_VER }}-py${{ matrix.python-version }}"
158157
build-args: |
159-
PYTHON_VER=${{ env.PYTHON_VER }}
160-
- name: "Debug: Show docker images"
161-
run: "docker image ls"
158+
PYTHON_VER=${{ matrix.python-version }}
162159
- name: "Run Tests"
163160
run: "poetry run invoke pytest"
164-
needs:
165-
- "poetry"
166161
changelog:
167162
if: >
168163
contains(fromJson('["develop"]'), github.base_ref) &&
169164
(github.head_ref != 'main') && (!startsWith(github.head_ref, 'release'))
170-
runs-on: "ubuntu-22.04"
165+
runs-on: "ubuntu-latest"
171166
steps:
172167
- name: "Check out repository code"
173168
uses: "actions/checkout@v4"
@@ -176,100 +171,8 @@ jobs:
176171
- name: "Setup environment"
177172
uses: "networktocode/gh-action-setup-poetry-environment@v6"
178173
with:
179-
poetry-version: "1.8.5"
174+
poetry-version: "2.1.3"
180175
- name: "Check for changelog entry"
181176
run: |
182177
git fetch --no-tags origin +refs/heads/${{ github.base_ref }}:refs/remotes/origin/${{ github.base_ref }}
183178
poetry run towncrier check --compare-with origin/${{ github.base_ref }}
184-
publish_gh:
185-
name: "Publish to GitHub"
186-
runs-on: "ubuntu-24.04"
187-
# yamllint disable-line rule:quoted-strings
188-
if: startsWith(github.ref, 'refs/tags/v')
189-
env:
190-
INVOKE_JDIFF_LOCAL: "True"
191-
steps:
192-
- name: "Check out repository code"
193-
uses: "actions/checkout@v4"
194-
- name: "Setup environment"
195-
uses: "networktocode/gh-action-setup-poetry-environment@v6"
196-
with:
197-
poetry-version: "1.8.5"
198-
python-version: "3.12"
199-
poetry-install-options: "--no-root"
200-
- name: "Set env"
201-
run: "echo RELEASE_VERSION=${GITHUB_REF:10} >> $GITHUB_ENV"
202-
- name: "Run Poetry Version"
203-
run: "poetry version $RELEASE_VERSION"
204-
- name: "Build Documentation"
205-
run: "poetry run invoke build-and-check-docs"
206-
- name: "Run Poetry Build"
207-
run: "poetry build"
208-
- name: "Upload binaries to release"
209-
run: "gh release upload ${{ github.ref_name }} dist/*.{tar.gz,whl}"
210-
env:
211-
GH_TOKEN: "${{ secrets.NTC_GITHUB_TOKEN }}"
212-
needs:
213-
- "pytest"
214-
publish_pypi:
215-
name: "Push Package to PyPI"
216-
runs-on: "ubuntu-24.04"
217-
# yamllint disable-line rule:quoted-strings
218-
if: startsWith(github.ref, 'refs/tags/v')
219-
steps:
220-
- name: "Check out repository code"
221-
uses: "actions/checkout@v4"
222-
- name: "Set up Python"
223-
uses: "actions/setup-python@v5"
224-
with:
225-
python-version: "3.9"
226-
- name: "Install Python Packages"
227-
run: "pip install poetry"
228-
- name: "Set env"
229-
run: "echo RELEASE_VERSION=${GITHUB_REF:10} >> $GITHUB_ENV"
230-
- name: "Run Poetry Version"
231-
run: "poetry version $RELEASE_VERSION"
232-
- name: "Run Poetry Build"
233-
run: "poetry build"
234-
- name: "Push to PyPI"
235-
uses: "pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc" # v1.12.4
236-
with:
237-
user: "__token__"
238-
password: "${{ secrets.PYPI_API_TOKEN }}"
239-
needs:
240-
- "pytest"
241-
slack-notify:
242-
needs:
243-
- "publish_gh"
244-
- "publish_pypi"
245-
runs-on: "ubuntu-24.04"
246-
env:
247-
SLACK_WEBHOOK_URL: "${{ secrets.SLACK_WEBHOOK_URL }}"
248-
SLACK_MESSAGE: >-
249-
*NOTIFICATION: NEW-RELEASE-PUBLISHED*\n
250-
Repository: <${{ github.server_url }}/${{ github.repository }}|${{ github.repository }}>\n
251-
Release: <${{ github.server_url }}/${{ github.repository }}/releases/tag/${{ github.ref_name }}|${{ github.ref_name }}>\n
252-
Published by: <${{ github.server_url }}/${{ github.actor }}|${{ github.actor }}>
253-
steps:
254-
- name: "Send a notification to Slack"
255-
# ENVs cannot be used directly in job.if. This is a workaround to check
256-
# if SLACK_WEBHOOK_URL is present.
257-
if: "env.SLACK_WEBHOOK_URL != ''"
258-
uses: "slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3" # v1.27.1
259-
with:
260-
payload: |
261-
{
262-
"text": "${{ env.SLACK_MESSAGE }}",
263-
"blocks": [
264-
{
265-
"type": "section",
266-
"text": {
267-
"type": "mrkdwn",
268-
"text": "${{ env.SLACK_MESSAGE }}"
269-
}
270-
}
271-
]
272-
}
273-
env:
274-
SLACK_WEBHOOK_URL: "${{ secrets.SLACK_WEBHOOK_URL }}"
275-
SLACK_WEBHOOK_TYPE: "INCOMING_WEBHOOK"

0 commit comments

Comments
 (0)