Skip to content

Commit 28edd60

Browse files
authored
Merge pull request #752 from Kircheneer/release-1.6.5
[LTM] Release 1.6.5
2 parents a66dee6 + 0d3cdda commit 28edd60

File tree

9 files changed

+230
-99
lines changed

9 files changed

+230
-99
lines changed

.github/workflows/ci.yml

Lines changed: 42 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,58 +17,68 @@ env:
1717

1818
jobs:
1919
black:
20-
runs-on: "ubuntu-20.04"
20+
runs-on: "ubuntu-22.04"
2121
env:
2222
INVOKE_NAUTOBOT_SSOT_LOCAL: "True"
2323
steps:
2424
- name: "Check out repository code"
25-
uses: "actions/checkout@v2"
25+
uses: "actions/checkout@v4"
2626
- name: "Setup environment"
27-
uses: "networktocode/gh-action-setup-poetry-environment@v2"
27+
uses: "networktocode/gh-action-setup-poetry-environment@v6"
28+
with:
29+
poetry-version: "1.8.5"
2830
- name: "Linting: black"
2931
run: "poetry run invoke black"
3032
bandit:
31-
runs-on: "ubuntu-20.04"
33+
runs-on: "ubuntu-22.04"
3234
env:
3335
INVOKE_NAUTOBOT_SSOT_LOCAL: "True"
3436
steps:
3537
- name: "Check out repository code"
36-
uses: "actions/checkout@v2"
38+
uses: "actions/checkout@v4"
3739
- name: "Setup environment"
38-
uses: "networktocode/gh-action-setup-poetry-environment@v2"
40+
uses: "networktocode/gh-action-setup-poetry-environment@v6"
41+
with:
42+
poetry-version: "1.8.5"
3943
- name: "Linting: bandit"
4044
run: "poetry run invoke bandit"
4145
pydocstyle:
42-
runs-on: "ubuntu-20.04"
46+
runs-on: "ubuntu-22.04"
4347
env:
4448
INVOKE_NAUTOBOT_SSOT_LOCAL: "True"
4549
steps:
4650
- name: "Check out repository code"
47-
uses: "actions/checkout@v2"
51+
uses: "actions/checkout@v4"
4852
- name: "Setup environment"
49-
uses: "networktocode/gh-action-setup-poetry-environment@v2"
53+
uses: "networktocode/gh-action-setup-poetry-environment@v6"
54+
with:
55+
poetry-version: "1.8.5"
5056
- name: "Linting: pydocstyle"
5157
run: "poetry run invoke pydocstyle"
5258
flake8:
53-
runs-on: "ubuntu-20.04"
59+
runs-on: "ubuntu-22.04"
5460
env:
5561
INVOKE_NAUTOBOT_SSOT_LOCAL: "True"
5662
steps:
5763
- name: "Check out repository code"
58-
uses: "actions/checkout@v2"
64+
uses: "actions/checkout@v4"
5965
- name: "Setup environment"
60-
uses: "networktocode/gh-action-setup-poetry-environment@v2"
66+
uses: "networktocode/gh-action-setup-poetry-environment@v6"
67+
with:
68+
poetry-version: "1.8.5"
6169
- name: "Linting: flake8"
6270
run: "poetry run invoke flake8"
6371
yamllint:
64-
runs-on: "ubuntu-20.04"
72+
runs-on: "ubuntu-22.04"
6573
env:
6674
INVOKE_NAUTOBOT_SSOT_LOCAL: "True"
6775
steps:
6876
- name: "Check out repository code"
6977
uses: "actions/checkout@v2"
7078
- name: "Setup environment"
71-
uses: "networktocode/gh-action-setup-poetry-environment@v2"
79+
uses: "networktocode/gh-action-setup-poetry-environment@v6"
80+
with:
81+
poetry-version: "1.8.5"
7282
- name: "Linting: yamllint"
7383
run: "poetry run invoke yamllint"
7484
pylint:
@@ -78,20 +88,22 @@ jobs:
7888
- "flake8"
7989
- "yamllint"
8090
- "black"
81-
runs-on: "ubuntu-20.04"
91+
runs-on: "ubuntu-22.04"
8292
strategy:
8393
fail-fast: true
8494
matrix:
85-
python-version: ["3.8"]
86-
nautobot-version: ["1.6.0"]
95+
python-version: ["3.11"]
96+
nautobot-version: ["1.6.30"]
8797
env:
8898
INVOKE_NAUTOBOT_SSOT_PYTHON_VER: "${{ matrix.python-version }}"
8999
INVOKE_NAUTOBOT_SSOT_NAUTOBOT_VER: "${{ matrix.nautobot-version }}"
90100
steps:
91101
- name: "Check out repository code"
92-
uses: "actions/checkout@v2"
102+
uses: "actions/checkout@v4"
93103
- name: "Setup environment"
94-
uses: "networktocode/gh-action-setup-poetry-environment@v2"
104+
uses: "networktocode/gh-action-setup-poetry-environment@v6"
105+
with:
106+
poetry-version: "1.8.5"
95107
- name: "Set up Docker Buildx"
96108
id: "buildx"
97109
uses: "docker/setup-buildx-action@v1"
@@ -137,7 +149,9 @@ jobs:
137149
- name: "Check out repository code"
138150
uses: "actions/checkout@v2"
139151
- name: "Setup environment"
140-
uses: "networktocode/gh-action-setup-poetry-environment@v2"
152+
uses: "networktocode/gh-action-setup-poetry-environment@v6"
153+
with:
154+
poetry-version: "1.8.5"
141155
- name: "Set up Docker Buildx"
142156
id: "buildx"
143157
uses: "docker/setup-buildx-action@v1"
@@ -166,15 +180,15 @@ jobs:
166180
needs:
167181
- "unittest"
168182
name: "Publish to GitHub"
169-
runs-on: "ubuntu-20.04"
183+
runs-on: "ubuntu-22.04"
170184
if: "startsWith(github.ref, 'refs/tags/v')"
171185
steps:
172186
- name: "Check out repository code"
173-
uses: "actions/checkout@v2"
187+
uses: "actions/checkout@v4"
174188
- name: "Set up Python"
175-
uses: "actions/setup-python@v2"
189+
uses: "actions/setup-python@v6"
176190
with:
177-
python-version: "3.9"
191+
python-version: "3.11"
178192
- name: "Install Python Packages"
179193
run: "pip install poetry"
180194
- name: "Set env"
@@ -195,15 +209,15 @@ jobs:
195209
needs:
196210
- "unittest"
197211
name: "Push Package to PyPI"
198-
runs-on: "ubuntu-20.04"
212+
runs-on: "ubuntu-22.04"
199213
if: "startsWith(github.ref, 'refs/tags/v')"
200214
steps:
201215
- name: "Check out repository code"
202216
uses: "actions/checkout@v2"
203217
- name: "Set up Python"
204-
uses: "actions/setup-python@v2"
218+
uses: "actions/setup-python@v5"
205219
with:
206-
python-version: "3.9"
220+
python-version: "3.11"
207221
- name: "Install Python Packages"
208222
run: "pip install poetry"
209223
- name: "Set env"
@@ -221,7 +235,7 @@ jobs:
221235
needs:
222236
- "publish_gh"
223237
- "publish_pypi"
224-
runs-on: "ubuntu-20.04"
238+
runs-on: "ubuntu-22.04"
225239
env:
226240
SLACK_WEBHOOK_URL: "${{ secrets.SLACK_WEBHOOK_URL }}"
227241
SLACK_MESSAGE: >-

changes/590.changed

Lines changed: 0 additions & 1 deletion
This file was deleted.

changes/590.fixed

Lines changed: 0 additions & 1 deletion
This file was deleted.

changes/703.fixed

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/admin/release_notes/version_1.6.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,10 @@
7272
- [361](https://github.com/nautobot/nautobot-app-ssot/pull/361) - Backport of #350 by @Kircheneer
7373
- [363](https://github.com/nautobot/nautobot-app-ssot/pull/363) - Backport #362 by @Kircheneer
7474
- [373](https://github.com/nautobot/nautobot-app-ssot/pull/373) - change contrib.NautobotModel.get_from_db to use a PK by @Kircheneer
75+
76+
## v1.6.5 - 2025-04-02
77+
78+
## Fixed
79+
80+
- [704](https://github.com/nautobot/nautobot-app-ssot/pull/704) - Backport of #703 by @Kircheneer
81+
- [591](https://github.com/nautobot/nautobot-app-ssot/pull/591) - Backport of #591 by @Kircheneer

docs/requirements.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
griffe==0.30.1
2-
mkdocs==1.4.2
3-
mkdocs-material==9.0.11
4-
mkdocstrings==0.22.0
5-
mkdocstrings-python==1.1.2
6-
mkdocs-version-annotations==1.0.0
1+
mkdocs==1.6.0
2+
mkdocs-material==9.5.32
3+
markdown-version-annotations==1.0.1
4+
griffe==1.1.1
5+
mkdocstrings-python==1.10.8
6+
mkdocstrings==0.25.2
7+
mkdocs-autorefs==1.2.0

mkdocs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ extra:
7171
link: "https://twitter.com/networktocode"
7272
name: "Network to Code Twitter"
7373
markdown_extensions:
74+
- "markdown_version_annotations":
75+
admonition_tag: "???"
7476
- "admonition"
7577
- "toc":
7678
permalink: true
@@ -84,7 +86,6 @@ markdown_extensions:
8486
- "footnotes"
8587
plugins:
8688
- "search"
87-
- "mkdocs-version-annotations"
8889
- "mkdocstrings":
8990
default_handler: "python"
9091
handlers:

0 commit comments

Comments
 (0)