Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool

bakebot · bakebot · commit 20f20ed16135 · 2025-12-30T17:52:44.000Z
- [#291](nautobot/cookiecutter-nautobot-app#291) - Added support for Python `3.13`. - [#291](nautobot/cookiecutter-nautobot-app#291) - Updated minimum Nautobot version to `3.0.0`. - [#291](nautobot/cookiecutter-nautobot-app#291) - Updated maximum Nautobot version to `<4.0.0`. - [#309](nautobot/cookiecutter-nautobot-app#309) - Change the tag-nautobot-app workflow to support multiple nautobot-app versions. - [#320](nautobot/cookiecutter-nautobot-app#320) - Upstream testing now runs against selected branches. - [#319](nautobot/cookiecutter-nautobot-app#319) - Fixed nav typo and added missing 2.7.2 release notes. - [#322](nautobot/cookiecutter-nautobot-app#322) - Updated CI workflow to always regenerate poetry lockfile. **Full Changelog**: nautobot/cookiecutter-nautobot-app@nautobot-app-v2.7.2...nautobot-app-v3.0.0
diff --git a/.cookiecutter.json b/.cookiecutter.json
@@ -19,13 +19,17 @@
         "_drift_manager": {
             "template": "https://github.com/nautobot/cookiecutter-nautobot-app.git",
             "template_dir": "nautobot-app",
-            "template_ref": "nautobot-app-v2.7.1",
+            "template_ref": "nautobot-app-v3.0.0",
             "cookie_dir": "",
-            "branch_prefix": "drift-manager",
-            "pull_request_strategy": "update-or-create",
+            "pull_request_strategy": "create",
             "post_actions": [],
             "draft": false,
+<<<<<<< HEAD
             "baked_commit_ref": "249f18432f9651078256b7c8a8ece46b19b7f868"
+=======
+            "baked_commit_ref": "ef1be219c8a2a68e9df31c95fe992549df070f00",
+            "drift_managed_branch": "develop"
+>>>>>>> e3b162a (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
         }
     }
 }
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,7 +7,7 @@ labels:
 
 ### Environment
 * Python version:  <!-- Example: 3.11.4 -->
-* Nautobot version:  <!-- Example: 2.4.20 -->
+* Nautobot version:  <!-- Example: 3.0.0 -->
 * nautobot-device-onboarding version:  <!-- Example: 1.0.0 -->
 * ntc-templates version: <!-- Example: 5.1.0 -->
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -6,7 +6,7 @@ labels:
 ---
 
 ### Environment
-* Nautobot version:  <!-- Example: 2.4.20 -->
+* Nautobot version:  <!-- Example: 3.0.0 -->
 * nautobot-device-onboarding version:  <!-- Example: 1.0.0 -->
 
 <!--
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,39 +14,71 @@ env:
   APP_NAME: "nautobot-device-onboarding"
 
 jobs:
+  generate-lockfile:
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: "Check out repository code"
+        uses: "actions/checkout@v4"
+      - name: "Setup environment"
+        uses: "networktocode/gh-action-setup-poetry-environment@v6"
+        with:
+          poetry-version: "2.1.3"
+          poetry-install-options: "--only-root"
+      - name: "Regenerate poetry.lock"
+        run: "poetry lock --regenerate"
+      - name: "Upload poetry.lock"
+        uses: "actions/upload-artifact@v4"
+        with:
+          name: "poetry-lock"
+          path: "poetry.lock"
   ruff-format:
+    needs: "generate-lockfile"
     runs-on: "ubuntu-latest"
     env:
       INVOKE_NAUTOBOT_DEVICE_ONBOARDING_LOCAL: "True"
     steps:
       - name: "Check out repository code"
         uses: "actions/checkout@v4"
+      - name: "Download poetry.lock artifact"
+        uses: "actions/download-artifact@v4"
+        with:
+          name: "poetry-lock"
       - name: "Setup environment"
         uses: "networktocode/gh-action-setup-poetry-environment@v6"
         with:
           poetry-version: "2.1.3"
       - name: "Linting: ruff format"
         run: "poetry run invoke ruff --action format"
   ruff-lint:
+    needs: "generate-lockfile"
     runs-on: "ubuntu-latest"
     env:
       INVOKE_NAUTOBOT_DEVICE_ONBOARDING_LOCAL: "True"
     steps:
       - name: "Check out repository code"
         uses: "actions/checkout@v4"
+      - name: "Download poetry.lock artifact"
+        uses: "actions/download-artifact@v4"
+        with:
+          name: "poetry-lock"
       - name: "Setup environment"
         uses: "networktocode/gh-action-setup-poetry-environment@v6"
         with:
           poetry-version: "2.1.3"
       - name: "Linting: ruff"
         run: "poetry run invoke ruff --action lint"
   check-docs-build:
+    needs: "generate-lockfile"
     runs-on: "ubuntu-latest"
     env:
       INVOKE_NAUTOBOT_DEVICE_ONBOARDING_LOCAL: "True"
     steps:
       - name: "Check out repository code"
         uses: "actions/checkout@v4"
+      - name: "Download poetry.lock artifact"
+        uses: "actions/download-artifact@v4"
+        with:
+          name: "poetry-lock"
       - name: "Setup environment"
         uses: "networktocode/gh-action-setup-poetry-environment@v6"
         with:
@@ -68,25 +100,35 @@ jobs:
       - name: "Checking: poetry lock file"
         run: "poetry run invoke lock --check"
   yamllint:
+    needs: "generate-lockfile"
     runs-on: "ubuntu-latest"
     env:
       INVOKE_NAUTOBOT_DEVICE_ONBOARDING_LOCAL: "True"
     steps:
       - name: "Check out repository code"
         uses: "actions/checkout@v4"
+      - name: "Download poetry.lock artifact"
+        uses: "actions/download-artifact@v4"
+        with:
+          name: "poetry-lock"
       - name: "Setup environment"
         uses: "networktocode/gh-action-setup-poetry-environment@v6"
         with:
           poetry-version: "2.1.3"
       - name: "Linting: yamllint"
         run: "poetry run invoke yamllint"
   markdownlint:
+    needs: "generate-lockfile"
     runs-on: "ubuntu-latest"
     env:
       INVOKE_NAUTOBOT_DEVICE_ONBOARDING_LOCAL: "True"
     steps:
       - name: "Check out repository code"
         uses: "actions/checkout@v4"
+      - name: "Download poetry.lock artifact"
+        uses: "actions/download-artifact@v4"
+        with:
+          name: "poetry-lock"
       - name: "Setup environment"
         uses: "networktocode/gh-action-setup-poetry-environment@v6"
         with:
@@ -104,7 +146,11 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
+<<<<<<< HEAD
         python-version: ["3.13"]
+=======
+        python-version: ["3.10"]
+>>>>>>> e3b162a (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
         nautobot-version: ["3.0.0"]
     env:
       INVOKE_NAUTOBOT_DEVICE_ONBOARDING_PYTHON_VER: "${{ matrix.python-version }}"
@@ -150,11 +196,15 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
+<<<<<<< HEAD
         python-version: ["3.11"]  # 3.13 stable is tested in unittest_report stage.
+=======
+        python-version: ["3.10"]  # 3.13 stable is tested in unittest_report stage.
+>>>>>>> e3b162a (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
         db-backend: ["postgresql"]
         nautobot-version: ["stable"]
         include:
-          - python-version: "3.11"
+          - python-version: "3.10"
             db-backend: "postgresql"
             nautobot-version: "3.0.0"
           - python-version: "3.13"
@@ -198,7 +248,6 @@ jobs:
         if: "matrix.db-backend == 'mysql'"
       - name: "Run Tests"
         run: "poetry run invoke unittest"
-
   unittest_report:
     needs:
       - "check-in-docker"
@@ -271,8 +320,8 @@ jobs:
         with:
           name: "python-coverage-comment-action"
           path: "python-coverage-comment-action.txt"
-
   changelog:
+    needs: "generate-lockfile"
     if: >
       contains(fromJson('["develop","ltm-1.6"]'), github.base_ref) &&
       (github.head_ref != 'main') && (!startsWith(github.head_ref, 'release'))
@@ -282,6 +331,10 @@ jobs:
         uses: "actions/checkout@v4"
         with:
           fetch-depth: "0"
+      - name: "Download poetry.lock artifact"
+        uses: "actions/download-artifact@v4"
+        with:
+          name: "poetry-lock"
       - name: "Setup environment"
         uses: "networktocode/gh-action-setup-poetry-environment@v6"
         with:
diff --git a/.github/workflows/upstream_testing.yml b/.github/workflows/upstream_testing.yml
@@ -3,12 +3,26 @@ name: "Nautobot Upstream Monitor"
 
 on:  # yamllint disable-line rule:truthy rule:comments
   schedule:
-    - cron: "0 4 */2 * *"  # every other day at midnight
+    - cron: "0 4 */2 * *"  # every other day at 4 AM
   workflow_dispatch:
 
 jobs:
   upstream-test:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - nautobot_branch: "develop"
+            app_branch: "main"
+          - nautobot_branch: "next"
+            app_branch: "main"
+          - nautobot_branch: "ltm-2.4"
+            app_branch: "ltm-2.4"
+          # - nautobot_branch: "next-4.0"
+          #   app_branch: "next-4.0"
     uses: "nautobot/nautobot/.github/workflows/plugin_upstream_testing_base.yml@develop"
     with:  # Below could potentially be collapsed into a single argument if a concrete relationship between both is enforced
       invoke_context_name: "NAUTOBOT_DEVICE_ONBOARDING"
-      plugin_name: "nautobot-device-onboarding"
+      app_name: "nautobot-device-onboarding"
+      nautobot_branch: "${{ matrix.nautobot_branch }}"
+      app_branch: "${{ matrix.app_branch }}"
diff --git a/changes/+nautobot-app-v3.0.0.housekeeping b/changes/+nautobot-app-v3.0.0.housekeeping
@@ -0,0 +1 @@
+Rebaked from the cookie `nautobot-app-v3.0.0`.
diff --git a/docs/admin/compatibility_matrix.md b/docs/admin/compatibility_matrix.md
@@ -1,6 +1,7 @@
 # Compatibility Matrix
 
 | Device Onboarding Version | Nautobot First Support Version | Nautobot Last Support Version |
+<<<<<<< HEAD
 | ------------------------- | ------------------------------ | ----------------------------- |
 | 1.0.1                     | 1.0.0                          | 1.1.99                        |
 | 1.1.2                     | 1.2.0                          | 1.99                          |
@@ -22,3 +23,7 @@
 | 4.3.2                     | 2.4.2                          | 2.99                          |
 | 4.4.X                     | 2.4.20                         | 2.99                          |
 | 5.0.X                     | 3.0.0                          | 3.99                          |
+=======
+| ------------- | -------------------- | ------------- |
+| 1.0.X         | 3.0.0                | 2.99.99        |
+>>>>>>> e3b162a (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
diff --git a/docs/admin/install.md b/docs/admin/install.md
@@ -4,7 +4,7 @@ Here you will find detailed instructions on how to **install** and **configure**
 
 ## Prerequisites
 
-- The app is compatible with Nautobot 2.4.20 and higher.
+- The app is compatible with Nautobot 3.0.0 and higher.
 - Databases supported: PostgreSQL, MySQL
 
 !!! note
diff --git a/docs/dev/dev_environment.md b/docs/dev/dev_environment.md
@@ -181,7 +181,7 @@ The first thing you need to do is build the necessary Docker image for Nautobot
 #14 exporting layers
 #14 exporting layers 1.2s done
 #14 writing image sha256:2d524bc1665327faa0d34001b0a9d2ccf450612bf8feeb969312e96a2d3e3503 done
-#14 naming to docker.io/nautobot-device-onboarding/nautobot:2.4.20-py3.12 done
+#14 naming to docker.io/nautobot-device-onboarding/nautobot:3.0.0-py3.12 done
 ```
 
 ### Invoke - Starting the Development Environment
@@ -212,9 +212,9 @@ This will start all of the Docker containers used for hosting Nautobot. You shou
 ```bash
 ➜ docker ps
 ****CONTAINER ID   IMAGE                            COMMAND                  CREATED          STATUS          PORTS                                       NAMES
-ee90fbfabd77   nautobot-device-onboarding/nautobot:2.4.20-py3.12  "nautobot-server rqw…"   16 seconds ago   Up 13 seconds                                               nautobot_device_onboarding_worker_1
-b8adb781d013   nautobot-device-onboarding/nautobot:2.4.20-py3.12  "/docker-entrypoint.…"   20 seconds ago   Up 15 seconds   0.0.0.0:8080->8080/tcp, :::8080->8080/tcp   nautobot_device_onboarding_nautobot_1
-d64ebd60675d   nautobot-device-onboarding/nautobot:2.4.20-py3.12  "mkdocs serve -v -a …"   25 seconds ago   Up 18 seconds   0.0.0.0:8001->8080/tcp, :::8001->8080/tcp   nautobot_device_onboarding_docs_1
+ee90fbfabd77   nautobot-device-onboarding/nautobot:3.0.0-py3.12  "nautobot-server rqw…"   16 seconds ago   Up 13 seconds                                               nautobot_device_onboarding_worker_1
+b8adb781d013   nautobot-device-onboarding/nautobot:3.0.0-py3.12  "/docker-entrypoint.…"   20 seconds ago   Up 15 seconds   0.0.0.0:8080->8080/tcp, :::8080->8080/tcp   nautobot_device_onboarding_nautobot_1
+d64ebd60675d   nautobot-device-onboarding/nautobot:3.0.0-py3.12  "mkdocs serve -v -a …"   25 seconds ago   Up 18 seconds   0.0.0.0:8001->8080/tcp, :::8001->8080/tcp   nautobot_device_onboarding_docs_1
 e72d63129b36   postgres:13-alpine               "docker-entrypoint.s…"   25 seconds ago   Up 19 seconds   0.0.0.0:5432->5432/tcp, :::5432->5432/tcp   nautobot_device_onboarding_postgres_1
 96c6ff66997c   redis:6-alpine                   "docker-entrypoint.s…"   25 seconds ago   Up 21 seconds   0.0.0.0:6379->6379/tcp, :::6379->6379/tcp   nautobot_device_onboarding_redis_1
 ```
@@ -414,7 +414,11 @@ namespace.configure(
         "nautobot_device_onboarding": {
             ...
             "nautobot_ver": "3.0.0",
+<<<<<<< HEAD
         ...
+=======
+	    ...
+>>>>>>> e3b162a (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
         }
     }
 )
diff --git a/pyproject.toml b/pyproject.toml
@@ -27,6 +27,7 @@ include = [
 
 [tool.poetry.dependencies]
 python = ">=3.10,<3.14"
+<<<<<<< HEAD
 napalm = ">=4.1.0, <6.0.0"
 zipp = "^3.4.0"
 nautobot = ">=3.0.0,<4.0.0"
@@ -37,6 +38,10 @@ ntc-templates = "^7.0.0"
 # Netutils pin is needed for https://github.com/networktocode/netutils/pull/553
 netutils = "^1.9.1"
 ttp = "^0.9.0"
+=======
+# Used for local development
+nautobot = ">=3.0.0,<4.0.0"
+>>>>>>> e3b162a (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 
 [tool.poetry.group.dev.dependencies]
 coverage = "*"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Rebaked from the cookie `nautobot-app-v3.0.0`.