Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
fail-fast: true
matrix:
python-version: ["3.11"]
nautobot-version: ["2.4.2"]
nautobot-version: ["2.4.20"]
env:
INVOKE_NAUTOBOT_FIREWALL_MODELS_PYTHON_VER: "${{ matrix.python-version }}"
INVOKE_NAUTOBOT_FIREWALL_MODELS_NAUTOBOT_VER: "${{ matrix.nautobot-version }}"
Expand All @@ -121,7 +121,7 @@ jobs:
- name: "Constrain Nautobot version and regenerate lock file"
env:
INVOKE_NAUTOBOT_FIREWALL_MODELS_LOCAL: "true"
PY_CONSTRAINT: "${{ matrix.python-version == '3.9' && '3.9.2' || matrix.python-version }}"
PY_CONSTRAINT: "${{ matrix.python-version == '3.10' || matrix.python-version }}"
run: "poetry run invoke lock --constrain-nautobot-ver --constrain-python-ver=${{ env.PY_CONSTRAINT }}"
- name: "Set up Docker Buildx"
id: "buildx"
Expand Down Expand Up @@ -153,13 +153,13 @@ jobs:
strategy:
fail-fast: true
matrix:
python-version: ["3.9"] # 3.12 stable is tested in unittest_report stage.
python-version: ["3.10"] # 3.12 stable is tested in unittest_report stage.
db-backend: ["postgresql"]
nautobot-version: ["stable"]
include:
- python-version: "3.11"
db-backend: "postgresql"
nautobot-version: "2.4.2"
nautobot-version: "2.4.20"
# - python-version: "3.12"
# db-backend: "mysql"
# nautobot-version: "stable"
Expand All @@ -177,7 +177,7 @@ jobs:
- name: "Constrain Nautobot version and regenerate lock file"
env:
INVOKE_NAUTOBOT_FIREWALL_MODELS_LOCAL: "true"
PY_CONSTRAINT: "${{ matrix.python-version == '3.9' && '3.9.2' || matrix.python-version }}"
PY_CONSTRAINT: "${{ matrix.python-version == '3.10' || matrix.python-version }}"
run: "poetry run invoke lock --constrain-nautobot-ver --constrain-python-ver=${{ env.PY_CONSTRAINT }}"
- name: "Set up Docker Buildx"
id: "buildx"
Expand Down Expand Up @@ -229,7 +229,7 @@ jobs:
- name: "Constrain Nautobot version and regenerate lock file"
env:
INVOKE_NAUTOBOT_FIREWALL_MODELS_LOCAL: "true"
PY_CONSTRAINT: "${{ matrix.python-version == '3.9' && '3.9.2' || matrix.python-version }}"
PY_CONSTRAINT: "${{ matrix.python-version == '3.10' || matrix.python-version }}"
run: "poetry run invoke lock --constrain-nautobot-ver --constrain-python-ver=${{ env.PY_CONSTRAINT }}"
- name: "Set up Docker Buildx"
id: "buildx"
Expand Down
1 change: 1 addition & 0 deletions changes/332.changed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Migrated all models to use the UI Component Framework.
1 change: 1 addition & 0 deletions changes/332.dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Pinned Nautobot to 2.4.20 or greater to support several of the latest Nautobot UI Component updates.
2 changes: 2 additions & 0 deletions changes/332.fixed
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixed several places where rendering of `verbose_name` was incorrect.
Fixed failing linting issues.
4 changes: 2 additions & 2 deletions development/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
# -------------------------------------------------------------------------------------
# !!! USE CAUTION WHEN MODIFYING LINES BELOW

# Accepts a desired Nautobot version as build argument, default to 2.4.2
ARG NAUTOBOT_VER="2.4.2"
# Accepts a desired Nautobot version as build argument, default to 2.4.20
ARG NAUTOBOT_VER="2.4.20"

# Accepts a desired Python version as build argument, default to 3.11
ARG PYTHON_VER="3.11"
Expand Down
3 changes: 2 additions & 1 deletion docs/admin/compatibility_matrix.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
| 2.0.X | 2.0.0 | 2.2.99 |
| 2.1.X | 2.0.0 | 2.99.99 |
| 2.2.X | 2.0.0 | 2.99.99 |
| 2.3.X | 2.4.2 | 2.99.99 |
| 2.3.X | 2.4.2 | 2.99.99 |
| 2.4.X | 2.4.20 | 2.99.99 |
2 changes: 1 addition & 1 deletion docs/admin/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.2 and higher.
- The app is compatible with Nautobot 2.4.20 and higher.
- Databases supported: PostgreSQL, MySQL

!!! note
Expand Down
12 changes: 6 additions & 6 deletions docs/dev/dev_environment.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This is a quick reference guide if you're already familiar with the development

The [Invoke](http://www.pyinvoke.org/) library is used to provide some helper commands based on the environment. There are a few configuration parameters which can be passed to Invoke to override the default configuration:

- `nautobot_ver`: the version of Nautobot to use as a base for any built docker containers (default: 2.4.2)
- `nautobot_ver`: the version of Nautobot to use as a base for any built docker containers (default: 2.4.20)
- `project_name`: the default docker compose project name (default: `nautobot-firewall-models`)
- `python_ver`: the version of Python to use as a base for any built docker containers (default: 3.11)
- `local`: a boolean flag indicating if invoke tasks should be run on the host or inside the docker containers (default: False, commands will be run in docker containers)
Expand Down Expand Up @@ -183,7 +183,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-firewall-models/nautobot:2.4.2-py3.11 done
#14 naming to docker.io/nautobot-firewall-models/nautobot:2.4.20-py3.11 done
```

### Invoke - Starting the Development Environment
Expand Down Expand Up @@ -214,9 +214,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-firewall-models/nautobot:2.4.2-py3.11 "nautobot-server rqw…" 16 seconds ago Up 13 seconds nautobot_firewall_models_worker_1
b8adb781d013 nautobot-firewall-models/nautobot:2.4.2-py3.11 "/docker-entrypoint.…" 20 seconds ago Up 15 seconds 0.0.0.0:8080->8080/tcp, :::8080->8080/tcp nautobot_firewall_models_nautobot_1
d64ebd60675d nautobot-firewall-models/nautobot:2.4.2-py3.11 "mkdocs serve -v -a …" 25 seconds ago Up 18 seconds 0.0.0.0:8001->8080/tcp, :::8001->8080/tcp nautobot_firewall_models_docs_1
ee90fbfabd77 nautobot-firewall-models/nautobot:2.4.20-py3.11 "nautobot-server rqw…" 16 seconds ago Up 13 seconds nautobot_firewall_models_worker_1
b8adb781d013 nautobot-firewall-models/nautobot:2.4.20-py3.11 "/docker-entrypoint.…" 20 seconds ago Up 15 seconds 0.0.0.0:8080->8080/tcp, :::8080->8080/tcp nautobot_firewall_models_nautobot_1
d64ebd60675d nautobot-firewall-models/nautobot:2.4.20-py3.11 "mkdocs serve -v -a …" 25 seconds ago Up 18 seconds 0.0.0.0:8001->8080/tcp, :::8001->8080/tcp nautobot_firewall_models_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_firewall_models_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_firewall_models_redis_1
```
Expand Down Expand Up @@ -412,7 +412,7 @@ namespace.configure(
{
"nautobot_firewall_models": {
...
"nautobot_ver": "2.4.2",
"nautobot_ver": "2.4.20",
...
}
}
Expand Down
2 changes: 1 addition & 1 deletion invoke.example.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
nautobot_firewall_models:
nautobot_ver: "2.4.2"
nautobot_ver: "2.4.20"
python_ver: "3.11"
# local: false
# compose_dir: "/full/path/to/nautobot-app-firewall-models/development"
Expand Down
2 changes: 1 addition & 1 deletion invoke.mysql.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
nautobot_firewall_models:
project_name: "nautobot-firewall-models"
nautobot_ver: "2.4.2"
nautobot_ver: "2.4.20"
local: false
python_ver: "3.11"
compose_dir: "development"
Expand Down
Loading
Loading