Merge pull request #170 from nautobot/jlw-v2-release

v2 release prep
nautobot · Sep 29, 2023 · fe3f83c · fe3f83c
2 parents a8df957 + a69e00e
commit fe3f83c
Show file tree

Hide file tree

Showing 11 changed files with 108 additions and 96 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -77,7 +77,7 @@ jobs:
       fail-fast: true
       matrix:
         python-version: ["3.11"]
-        nautobot-version: ["2.0.0-rc.2"]
+        nautobot-version: ["2.0.0"]
     env:
       INVOKE_NAUTOBOT_FIREWALL_MODELS_PYTHON_VER: "${{ matrix.python-version }}"
       INVOKE_NAUTOBOT_FIREWALL_MODELS_NAUTOBOT_VER: "${{ matrix.nautobot-version }}"
@@ -115,14 +115,17 @@ jobs:
       matrix:
         python-version: ["3.8"]
         db-backend: ["postgresql"]
-        nautobot-version: ["2.0.0-rc.4"]
+        nautobot-version: ["2.0.0"]
         # The include is a method to limit the amount of jobs ran. This essentially
         # means that in addition to standard postgres and stable, also the lowest
         # supported version and with mysql
         include:
           - python-version: "3.11"
             db-backend: "postgresql"
-            nautobot-version: "2.0.0-rc.4"
+            nautobot-version: "2.0.0"
+          - python-version: "3.11"
+            db-backend: "postgresql"
+            nautobot-version: "stable"
           # - python-version: "3.11"
           #   db-backend: "mysql"
           #   nautobot-version: "2.0.0-rc.4"

diff --git a/development/Dockerfile b/development/Dockerfile
@@ -7,7 +7,7 @@
 # !!! USE CAUTION WHEN MODIFYING LINES BELOW
 
 # Accepts a desired Nautobot version as build argument, default to `2.0.0-rc.2`
-ARG NAUTOBOT_VER="2.0.0-rc.2"
+ARG NAUTOBOT_VER="2.0.0"
 
 # Accepts a desired Python version as build argument, default to 3.11
 ARG PYTHON_VER="3.11"

diff --git a/docs/admin/compatibility_matrix.md b/docs/admin/compatibility_matrix.md
@@ -5,3 +5,4 @@
 | 1.0.X         | 1.2.0                | 1.5.99        |
 | 1.1.X         | 1.4.0                | 1.5.99        |
 | 1.2.X         | 1.4.0                | 1.5.99        |
+| 2.0.X         | 2.0.0                | 2.9999        |
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 plugin is compatible with Nautobot 1.4.0 and higher.
+- The plugin is compatible with Nautobot 2.0.0 and higher.
 - Databases supported: PostgreSQL, MySQL
 
 !!! note

diff --git a/docs/admin/release_notes/version_2.0.md b/docs/admin/release_notes/version_2.0.md
@@ -0,0 +1,19 @@
+# v2.0 Release Notes
+
+This document describes all new features and changes in the release `2.0`. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## v2.0.0 - 2023-05-03
+
+### Changed
+
+- [#167](https://github.com/nautobot/nautobot-plugin-firewall-models/pull/167) Nautobot 2.0.0 as minimum dependency
+- [#167](https://github.com/nautobot/nautobot-plugin-firewall-models/pull/167) Substantial updates to API
+- [#167](https://github.com/nautobot/nautobot-plugin-firewall-models/pull/167) on_delete=PROTECT was moved from the model custom through field to a DB signal
+
+### Added
+
+- [#167](https://github.com/nautobot/nautobot-plugin-firewall-models/pull/167) Added support for Python 3.11
+
+### Removed
+
+- [#167](https://github.com/nautobot/nautobot-plugin-firewall-models/pull/167) Dropped support for Python 3.7
diff --git a/invoke.example.yml b/invoke.example.yml
@@ -1,11 +1,12 @@
 ---
 nautobot_firewall_models:
   project_name: "nautobot_firewall_models"
-  nautobot_ver: "1.3.5"
+  nautobot_ver: "2.0.0"
   local: false
-  python_ver: "3.8"
+  python_ver: "3.11"
   compose_dir: "development"
   compose_files:
-    - "docker-compose.requirements.yml"
+    - "docker-compose.postgres.yml"
+    - "docker-compose.redis.yml"
     - "docker-compose.base.yml"
     - "docker-compose.dev.yml"
diff --git a/invoke.mysql.yml b/invoke.mysql.yml
@@ -1,12 +1,12 @@
 ---
 nautobot_firewall_models:
   project_name: "nautobot_firewall_models"
-  nautobot_ver: "1.3.5"
+  nautobot_ver: "2.0.0"
   local: false
-  python_ver: "3.8"
+  python_ver: "3.11"
   compose_dir: "development"
   compose_files:
-    - "docker-compose.base.yml"
-    - "docker-compose.redis.yml"
     - "docker-compose.mysql.yml"
+    - "docker-compose.redis.yml"
+    - "docker-compose.base.yml"
     - "docker-compose.dev.yml"
diff --git a/nautobot_firewall_models/__init__.py b/nautobot_firewall_models/__init__.py
@@ -18,8 +18,8 @@ class NautobotFirewallModelsConfig(PluginConfig):
     description = "Nautobot App to model firewall and security objects. Allows users to model policies in a vendor-neutral manner and use that data to drive network security automation."
     base_url = "firewall"
     required_settings = []
-    min_version = "2.0.0a1"
-    # max_version = "1.9999"
+    min_version = "2.0.0"
+    max_version = "2.9999"
     default_settings = {
         "capirca_remark_pass": True,
         "capirca_os_map": {},

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nautobot-firewall-models"
-version = "2.0.0rc2"
+version = "2.0.0"
 description = "Nautobot plugin to model firewall objects."
 authors = ["Network to Code, LLC <info@networktocode.com>"]
 license = "Apache-2.0"
@@ -19,7 +19,7 @@ packages = [{ include = "nautobot_firewall_models" }]
 [tool.poetry.dependencies]
 # Used for local development
 python = "^3.8,<3.12"
-nautobot = ">=2.0.0rc1,<2.0.0rc99"
+nautobot = "^2.0.0"
 netutils = "^1.0.0"
 capirca = "^2.0.6"
 

diff --git a/tasks.py b/tasks.py
@@ -38,7 +38,7 @@ def is_truthy(arg):
 namespace.configure(
     {
         "nautobot_firewall_models": {
-            "nautobot_ver": "2.0.0-rc.4",
+            "nautobot_ver": "2.0.0",
             "project_name": "nautobot_firewall_models",
             "python_ver": "3.11",
             "local": False,