Skip to content

Commit 7947fe4

Browse files
nautobot-botbakebotgsnider2195
authored
Cookie updated by NetworkToCode Cookie Drift Manager Tool (#224)
* Cookie updated by NetworkToCode Cookie Drift Manager Tool Template: ``` { "template": "https://github.com/nautobot/cookiecutter-nautobot-app.git", "dir": "nautobot-app", "ref": "nautobot-app-v2.5.1", "path": null } ``` Cookie: ``` { "remote": "https://github.com/nautobot/nautobot-app-netbox-importer.git", "path": "/tmp/tmpq2o0ufjp/nautobot-app-netbox-importer", "repository_path": "/tmp/tmpq2o0ufjp/nautobot-app-netbox-importer", "dir": "", "branch_prefix": "drift-manager", "context": { "codeowner_github_usernames": "@glennmatthews @jathanism @lampwins @chadell", "full_name": "Network to Code, LLC", "email": "opensource@networktocode.com", "github_org": "nautobot", "app_name": "nautobot_netbox_importer", "verbose_name": "Nautobot NetBox Importer", "app_slug": "nautobot-netbox-importer", "project_slug": "nautobot-app-netbox-importer", "repo_url": "https://github.com/nautobot/nautobot-app-netbox-importer", "base_url": "netbox-importer", "min_nautobot_version": "2.0.6", "max_nautobot_version": "2.9999", "camel_name": "NautobotNetboxImporter", "project_short_description": "Data importer from NetBox 3.x to Nautobot 2.x.", "model_class_name": "None", "open_source_license": "Apache-2.0", "docs_base_url": "https://docs.nautobot.com", "docs_app_url": "https://docs.nautobot.com/projects/netbox-importer/en/latest", "_extensions": [ "local_extensions.camel_case_to_kebab", "local_extensions.camel_case_to_words" ], "_template": "https://github.com/nautobot/cookiecutter-nautobot-app.git", "_output_dir": "/tmp/tmpq2o0ufjp", "_repo_dir": "/github/home/.cookiecutters/cookiecutter-nautobot-app/nautobot-app", "_checkout": "nautobot-app-v2.5.1" }, "base_branch": "develop", "remote_name": "origin", "pull_request_strategy": "PullRequestStrategy.CREATE", "post_actions": [], "baked_commit_ref": "5b4ec3fd8bd98821393b164a0ea98e8ca90bfdb4", "draft": false } ``` CLI Arguments: ``` { "cookie_dir": "", "input": false, "json_filename": "", "output_dir": "", "push": true, "template": "", "template_dir": "", "template_ref": "nautobot-app-v2.5.1", "pull_request": null, "post_action": [], "disable_post_actions": true, "draft": null } ``` * Cookie updated by NetworkToCode Cookie Drift Manager Tool Template: ``` { "template": "https://github.com/nautobot/cookiecutter-nautobot-app.git", "dir": "nautobot-app", "ref": "nautobot-app-v2.6.0", "path": null } ``` Cookie: ``` { "remote": "https://github.com/nautobot/nautobot-app-netbox-importer.git", "path": "/tmp/tmp4hdxclvd/nautobot-app-netbox-importer", "repository_path": "/tmp/tmp4hdxclvd/nautobot-app-netbox-importer", "dir": "", "branch_prefix": "drift-manager", "context": { "codeowner_github_usernames": "@glennmatthews @jathanism @lampwins @chadell", "full_name": "Network to Code, LLC", "email": "opensource@networktocode.com", "github_org": "nautobot", "app_name": "nautobot_netbox_importer", "verbose_name": "Nautobot NetBox Importer", "app_slug": "nautobot-netbox-importer", "project_slug": "nautobot-app-netbox-importer", "repo_url": "https://github.com/nautobot/nautobot-app-netbox-importer", "base_url": "netbox-importer", "camel_name": "NautobotNetboxImporter", "project_short_description": "Data importer from NetBox 3.x to Nautobot 2.x.", "model_class_name": "None", "open_source_license": "Apache-2.0", "docs_base_url": "https://docs.nautobot.com", "docs_app_url": "https://docs.nautobot.com/projects/netbox-importer/en/latest", "_extensions": [ "local_extensions.camel_case_to_kebab", "local_extensions.camel_case_to_words", "local_extensions.NautobotVersions" ], "_template": "https://github.com/nautobot/cookiecutter-nautobot-app.git", "_output_dir": "/tmp/tmp4hdxclvd", "_repo_dir": "/github/home/.cookiecutters/cookiecutter-nautobot-app/nautobot-app", "_checkout": "nautobot-app-v2.6.0" }, "base_branch": "develop", "remote_name": "origin", "pull_request_strategy": "PullRequestStrategy.UPDATE_OR_CREATE", "post_actions": [], "baked_commit_ref": "5b4ec3fd8bd98821393b164a0ea98e8ca90bfdb4", "draft": false } ``` CLI Arguments: ``` { "cookie_dir": "", "input": false, "json_filename": "", "output_dir": "", "push": true, "template": "", "template_dir": "", "template_ref": "nautobot-app-v2.6.0", "pull_request": "update-or-create", "post_action": [], "disable_post_actions": true, "draft": null } ``` * fix merge conflicts * fix CI * Pinned Django debug toolbar to <6.0.0. * update codeowners --------- Co-authored-by: bakebot <info@networktocode.com> Co-authored-by: Gary Snider <75227981+gsnider2195@users.noreply.github.com>
1 parent b781560 commit 7947fe4

File tree

19 files changed

+1824
-1089
lines changed

19 files changed

+1824
-1089
lines changed

‎.cookiecutter.json‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"cookiecutter": {
3-
"codeowner_github_usernames": "@glennmatthews @jathanism @lampwins @chadell",
3+
"codeowner_github_usernames": "@nautobot/maintain-nautobot-apps",
44
"full_name": "Network to Code, LLC",
55
"email": "opensource@networktocode.com",
66
"github_org": "nautobot",
@@ -10,8 +10,6 @@
1010
"project_slug": "nautobot-app-netbox-importer",
1111
"repo_url": "https://github.com/nautobot/nautobot-app-netbox-importer",
1212
"base_url": "netbox-importer",
13-
"min_nautobot_version": "2.0.6",
14-
"max_nautobot_version": "2.9999",
1513
"camel_name": "NautobotNetboxImporter",
1614
"project_short_description": "Data importer from NetBox 3.x to Nautobot 2.x.",
1715
"model_class_name": "None",
@@ -21,16 +19,13 @@
2119
"_drift_manager": {
2220
"template": "https://github.com/nautobot/cookiecutter-nautobot-app.git",
2321
"template_dir": "nautobot-app",
24-
"template_ref": "refs/tags/nautobot-app-v2.5.0",
22+
"template_ref": "nautobot-app-v2.6.0",
2523
"cookie_dir": "",
2624
"branch_prefix": "drift-manager",
27-
"pull_request_strategy": "create",
28-
"post_actions": [
29-
"ruff",
30-
"poetry"
31-
],
25+
"pull_request_strategy": "update-or-create",
26+
"post_actions": [],
3227
"draft": false,
33-
"baked_commit_ref": "5b4ec3fd8bd98821393b164a0ea98e8ca90bfdb4"
28+
"baked_commit_ref": "200ba6cff7edd47c51c81277542af0fa864023b4"
3429
}
3530
}
3631
}

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Default owner(s) of all files in this repository
2-
* @glennmatthews @lampwins @chadell
2+
* @nautobot/maintain-nautobot-apps

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
---
22
name: 🐛 Bug Report
33
about: Report a reproducible bug in the current release of nautobot-netbox-importer
4+
labels:
5+
- "type: bug"
46
---
57

68
### Environment
79
* Python version: <!-- Example: 3.11.4 -->
8-
* Nautobot version: <!-- Example: 2.0.6 -->
10+
* Nautobot version: <!-- Example: 2.4.2 -->
911
* nautobot-netbox-importer version: <!-- Example: 1.0.0 -->
1012

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

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
---
22
name: ✨ Feature Request
33
about: Propose a new feature or enhancement
4-
4+
labels:
5+
- "type: feature"
56
---
67

78
### Environment
8-
* Nautobot version: <!-- Example: 2.0.6 -->
9+
* Nautobot version: <!-- Example: 2.4.2 -->
910
* nautobot-netbox-importer version: <!-- Example: 1.0.0 -->
1011

1112
<!--

‎.github/workflows/ci.yml‎

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717

1818
jobs:
1919
ruff-format:
20-
runs-on: "ubuntu-22.04"
20+
runs-on: "ubuntu-latest"
2121
env:
2222
INVOKE_NAUTOBOT_NETBOX_IMPORTER_LOCAL: "True"
2323
steps:
@@ -26,11 +26,11 @@ jobs:
2626
- name: "Setup environment"
2727
uses: "networktocode/gh-action-setup-poetry-environment@v6"
2828
with:
29-
poetry-version: "1.8.5"
29+
poetry-version: "2.1.3"
3030
- name: "Linting: ruff format"
3131
run: "poetry run invoke ruff --action format"
3232
ruff-lint:
33-
runs-on: "ubuntu-22.04"
33+
runs-on: "ubuntu-latest"
3434
env:
3535
INVOKE_NAUTOBOT_NETBOX_IMPORTER_LOCAL: "True"
3636
steps:
@@ -39,11 +39,11 @@ jobs:
3939
- name: "Setup environment"
4040
uses: "networktocode/gh-action-setup-poetry-environment@v6"
4141
with:
42-
poetry-version: "1.8.5"
42+
poetry-version: "2.1.3"
4343
- name: "Linting: ruff"
4444
run: "poetry run invoke ruff --action lint"
4545
check-docs-build:
46-
runs-on: "ubuntu-22.04"
46+
runs-on: "ubuntu-latest"
4747
env:
4848
INVOKE_NAUTOBOT_NETBOX_IMPORTER_LOCAL: "True"
4949
steps:
@@ -52,11 +52,12 @@ jobs:
5252
- name: "Setup environment"
5353
uses: "networktocode/gh-action-setup-poetry-environment@v6"
5454
with:
55-
poetry-version: "1.8.5"
55+
poetry-version: "2.1.3"
56+
poetry-install-options: "--only dev,docs"
5657
- name: "Check Docs Build"
5758
run: "poetry run invoke build-and-check-docs"
5859
poetry:
59-
runs-on: "ubuntu-22.04"
60+
runs-on: "ubuntu-latest"
6061
env:
6162
INVOKE_NAUTOBOT_NETBOX_IMPORTER_LOCAL: "True"
6263
steps:
@@ -65,11 +66,11 @@ jobs:
6566
- name: "Setup environment"
6667
uses: "networktocode/gh-action-setup-poetry-environment@v6"
6768
with:
68-
poetry-version: "1.8.5"
69+
poetry-version: "2.1.3"
6970
- name: "Checking: poetry lock file"
7071
run: "poetry run invoke lock --check"
7172
yamllint:
72-
runs-on: "ubuntu-22.04"
73+
runs-on: "ubuntu-latest"
7374
env:
7475
INVOKE_NAUTOBOT_NETBOX_IMPORTER_LOCAL: "True"
7576
steps:
@@ -78,11 +79,11 @@ jobs:
7879
- name: "Setup environment"
7980
uses: "networktocode/gh-action-setup-poetry-environment@v6"
8081
with:
81-
poetry-version: "1.8.5"
82+
poetry-version: "2.1.3"
8283
- name: "Linting: yamllint"
8384
run: "poetry run invoke yamllint"
8485
markdownlint:
85-
runs-on: "ubuntu-22.04"
86+
runs-on: "ubuntu-latest"
8687
env:
8788
INVOKE_NAUTOBOT_NETBOX_IMPORTER_LOCAL: "True"
8889
steps:
@@ -91,7 +92,7 @@ jobs:
9192
- name: "Setup environment"
9293
uses: "networktocode/gh-action-setup-poetry-environment@v6"
9394
with:
94-
poetry-version: "1.8.5"
95+
poetry-version: "2.1.3"
9596
- name: "Linting: markdownlint"
9697
run: "poetry run invoke markdownlint"
9798
check-in-docker:
@@ -101,7 +102,7 @@ jobs:
101102
- "poetry"
102103
- "yamllint"
103104
- "markdownlint"
104-
runs-on: "ubuntu-22.04"
105+
runs-on: "ubuntu-latest"
105106
strategy:
106107
fail-fast: true
107108
matrix:
@@ -116,11 +117,12 @@ jobs:
116117
- name: "Setup environment"
117118
uses: "networktocode/gh-action-setup-poetry-environment@v6"
118119
with:
119-
poetry-version: "1.8.5"
120+
poetry-version: "2.1.3"
120121
- name: "Constrain Nautobot version and regenerate lock file"
121122
env:
122123
INVOKE_NAUTOBOT_NETBOX_IMPORTER_LOCAL: "true"
123-
run: "poetry run invoke lock --constrain-nautobot-ver --constrain-python-ver"
124+
PY_CONSTRAINT: "${{ matrix.python-version == '3.9' && '3.9.2' || matrix.python-version }}"
125+
run: "poetry run invoke lock --constrain-nautobot-ver --constrain-python-ver=${{ env.PY_CONSTRAINT }}"
124126
- name: "Set up Docker Buildx"
125127
id: "buildx"
126128
uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2" # v3.10.0
@@ -154,7 +156,7 @@ jobs:
154156
python-version: ["3.9"] # 3.12 2.4 is tested in unittest_report stage.
155157
db-backend: ["postgresql"]
156158
nautobot-version: ["2.4.9"]
157-
runs-on: "ubuntu-22.04"
159+
runs-on: "ubuntu-latest"
158160
env:
159161
INVOKE_NAUTOBOT_NETBOX_IMPORTER_PYTHON_VER: "${{ matrix.python-version }}"
160162
INVOKE_NAUTOBOT_NETBOX_IMPORTER_NAUTOBOT_VER: "${{ matrix.nautobot-version }}"
@@ -164,11 +166,12 @@ jobs:
164166
- name: "Setup environment"
165167
uses: "networktocode/gh-action-setup-poetry-environment@v6"
166168
with:
167-
poetry-version: "1.8.5"
169+
poetry-version: "2.1.3"
168170
- name: "Constrain Nautobot version and regenerate lock file"
169171
env:
170172
INVOKE_NAUTOBOT_NETBOX_IMPORTER_LOCAL: "true"
171-
run: "poetry run invoke lock --constrain-nautobot-ver --constrain-python-ver"
173+
PY_CONSTRAINT: "${{ matrix.python-version == '3.9' && '3.9.2' || matrix.python-version }}"
174+
run: "poetry run invoke lock --constrain-nautobot-ver --constrain-python-ver=${{ env.PY_CONSTRAINT }}"
172175
- name: "Set up Docker Buildx"
173176
id: "buildx"
174177
uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2" # v3.10.0
@@ -202,7 +205,7 @@ jobs:
202205
python-version: ["3.12"]
203206
db-backend: ["postgresql"]
204207
nautobot-version: ["2.4"]
205-
runs-on: "ubuntu-22.04"
208+
runs-on: "ubuntu-latest"
206209
permissions:
207210
pull-requests: "write"
208211
contents: "write"
@@ -215,11 +218,12 @@ jobs:
215218
- name: "Setup environment"
216219
uses: "networktocode/gh-action-setup-poetry-environment@v6"
217220
with:
218-
poetry-version: "1.8.5"
221+
poetry-version: "2.1.3"
219222
- name: "Constrain Nautobot version and regenerate lock file"
220223
env:
221224
INVOKE_NAUTOBOT_NETBOX_IMPORTER_LOCAL: "true"
222-
run: "poetry run invoke lock --constrain-nautobot-ver --constrain-python-ver"
225+
PY_CONSTRAINT: "${{ matrix.python-version == '3.9' && '3.9.2' || matrix.python-version }}"
226+
run: "poetry run invoke lock --constrain-nautobot-ver --constrain-python-ver=${{ env.PY_CONSTRAINT }}"
223227
- name: "Set up Docker Buildx"
224228
id: "buildx"
225229
uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2" # v3.10.0
@@ -270,7 +274,7 @@ jobs:
270274
if: >
271275
contains(fromJson('["develop","ltm-1.6"]'), github.base_ref) &&
272276
(github.head_ref != 'main') && (!startsWith(github.head_ref, 'release'))
273-
runs-on: "ubuntu-22.04"
277+
runs-on: "ubuntu-latest"
274278
steps:
275279
- name: "Check out repository code"
276280
uses: "actions/checkout@v4"
@@ -279,7 +283,7 @@ jobs:
279283
- name: "Setup environment"
280284
uses: "networktocode/gh-action-setup-poetry-environment@v6"
281285
with:
282-
poetry-version: "1.8.5"
286+
poetry-version: "2.1.3"
283287
- name: "Check for changelog entry"
284288
run: |
285289
git fetch --no-tags origin +refs/heads/${{ github.base_ref }}:refs/remotes/origin/${{ github.base_ref }}
@@ -289,7 +293,7 @@ jobs:
289293
- "unittest"
290294
- "unittest_report"
291295
name: "Publish to GitHub"
292-
runs-on: "ubuntu-22.04"
296+
runs-on: "ubuntu-latest"
293297
if: "startsWith(github.ref, 'refs/tags/v')"
294298
env:
295299
INVOKE_NAUTOBOT_NETBOX_IMPORTER_LOCAL: "True"
@@ -301,7 +305,7 @@ jobs:
301305
- name: "Setup environment"
302306
uses: "networktocode/gh-action-setup-poetry-environment@v6"
303307
with:
304-
poetry-version: "1.8.5"
308+
poetry-version: "2.1.3"
305309
python-version: "3.12"
306310
poetry-install-options: "--no-root"
307311
- name: "Set env"
@@ -321,7 +325,7 @@ jobs:
321325
- "unittest"
322326
- "unittest_report"
323327
name: "Push Package to PyPI"
324-
runs-on: "ubuntu-22.04"
328+
runs-on: "ubuntu-latest"
325329
if: "startsWith(github.ref, 'refs/tags/v')"
326330
env:
327331
INVOKE_NAUTOBOT_NETBOX_IMPORTER_LOCAL: "True"
@@ -331,7 +335,7 @@ jobs:
331335
- name: "Setup environment"
332336
uses: "networktocode/gh-action-setup-poetry-environment@v6"
333337
with:
334-
poetry-version: "1.8.5"
338+
poetry-version: "2.1.3"
335339
python-version: "3.12"
336340
poetry-install-options: "--no-root"
337341
- name: "Set env"
@@ -351,9 +355,9 @@ jobs:
351355
needs:
352356
- "publish_gh"
353357
- "publish_pypi"
354-
runs-on: "ubuntu-22.04"
358+
runs-on: "ubuntu-latest"
355359
env:
356-
SLACK_WEBHOOK_URL: "${{ secrets.SLACK_WEBHOOK_URL }}"
360+
SLACK_WEBHOOK_URL: "${{ secrets.OSS_PYPI_SLACK_WEBHOOK_URL }}"
357361
SLACK_MESSAGE: >-
358362
*NOTIFICATION: NEW-RELEASE-PUBLISHED*\n
359363
Repository: <${{ github.server_url }}/${{ github.repository }}|${{ github.repository }}>\n
@@ -380,5 +384,5 @@ jobs:
380384
]
381385
}
382386
env:
383-
SLACK_WEBHOOK_URL: "${{ secrets.SLACK_WEBHOOK_URL }}"
387+
SLACK_WEBHOOK_URL: "${{ secrets.OSS_PYPI_SLACK_WEBHOOK_URL }}"
384388
SLACK_WEBHOOK_TYPE: "INCOMING_WEBHOOK"

‎.readthedocs.yaml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,22 @@
66
# Required
77
version: 2
88

9-
# Set the version of Python in the build environment.
9+
# Setup the build environment.
1010
build:
11-
os: "ubuntu-22.04"
11+
os: "ubuntu-lts-latest"
1212
tools:
13-
python: "3.10"
13+
python: "3.12"
14+
jobs:
15+
post_install:
16+
# Install poetry
17+
# https://python-poetry.org/docs/#installing-manually
18+
- "pip install poetry"
19+
# Install dependencies 'docs' dependency group
20+
# https://python-poetry.org/docs/managing-dependencies/#dependency-groups
21+
# VIRTUAL_ENV needs to be set manually for now.
22+
# See https://github.com/readthedocs/readthedocs.org/pull/11152/
23+
- "VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH poetry install --only docs"
1424

1525
mkdocs:
1626
configuration: "mkdocs.yml"
1727
fail_on_warning: true
18-
19-
# Use our docs/requirements.txt during installation.
20-
python:
21-
install:
22-
- requirements: "docs/requirements.txt"

‎changes/+nautobot-app-v2.5.1.housekeeping‎

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

‎changes/+nautobot-app-v2.6.0.housekeeping‎

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

‎changes/224.dependencies‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Pinned Django debug toolbar to <6.0.0.

‎docs/dev/contributing.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ The project is following Network to Code software development guidelines and is
77
- Python linting and formatting: `pylint` and `ruff`.
88
- YAML linting is done with `yamllint`.
99
- Django unit test to ensure the app is working properly.
10+
- Django Template linting: `djlint`
11+
- Django Template formatting: `djhtml`
1012

1113
Documentation is built using [mkdocs](https://www.mkdocs.org/). The [Docker based development environment](dev_environment.md#docker-development-environment) automatically starts a container hosting a live version of the documentation website on [http://localhost:8001](http://localhost:8001) that auto-refreshes when you make any changes to your local files.
1214

0 commit comments

Comments
 (0)