Skip to content

Commit

Permalink
Merge pull request #277 from nautobot/main
Browse files Browse the repository at this point in the history
Main to LTM 1.6
  • Loading branch information
smk4664 authored Sep 29, 2023
2 parents 948d6db + 1d7365d commit dddb9ed
Show file tree
Hide file tree
Showing 8 changed files with 1,017 additions and 803 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
fail-fast: true
matrix:
python-version: ["3.8", "3.9", "3.10"]
nautobot-version: ["1.5.4", "stable"]
nautobot-version: ["1.6.2", "stable"]
runs-on: "ubuntu-20.04"
env:
INVOKE_NAUTOBOT_CHATOPS_PYTHON_VER: "${{ matrix.python-version }}"
Expand Down
1 change: 1 addition & 0 deletions docs/admin/compatibility_matrix.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ While that last supported version will not be strictly enforced via the `max_ver
| 1.9.X | 1.2.0 | 1.5.99 [Official] |
| 1.10.X | 1.3.0 | 1.5.99 [Official] |
| 2.0.X | 1.5.4 | 1.6.99 [Official] |
| 2.1.X | 1.6.2 | 1.6.99 [Official] |
9 changes: 9 additions & 0 deletions docs/admin/release_notes/version_2.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!-- markdownlint-disable MD024 -->
# v2.1 Release Notes

<!-- towncrier release notes start -->
## [v2.1.0 (2023-09-28)](https://github.com/nautobot/nautobot-plugin-chatops/releases/tag/v2.1.0)

### Fixed

- [#273](https://github.com/nautobot/nautobot-plugin-chatops/issues/273) - Fixed dependency resolution issues with latest release of golden config.
4 changes: 4 additions & 0 deletions docs/dev/release_checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@ Create a release branch off of `develop` (`git checkout -b release-1.4.3 develop

Generate release notes with `towncrier build --version 1.4.3` and answer `yes` to the prompt `Is it okay if I remove those files? [Y/n]:`. This will update the release notes in `docs/admin/release_notes/version_1.4.md`, stage that file in git, and `git rm` all the fragments that have now been incorporated into the release notes.

!!! note
There is now an invoke task to generate release notes
`invoke generate-release-notes --version 2.1.0`

Run `invoke markdownlint` to make sure the generated release notes pass the linter checks.

Check the git diff to verify the changes are correct (`git diff --cached`).
Expand Down
1 change: 1 addition & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ nav:
- Compatibility Matrix: "admin/compatibility_matrix.md"
- Release Notes:
- "admin/release_notes/index.md"
- v2.1: "admin/release_notes/version_2.1.md"
- v2.0: "admin/release_notes/version_2.0.md"
- v1.11: "admin/release_notes/version_1.11.md"
- v1.10: "admin/release_notes/version_1.10.md"
Expand Down
1,778 changes: 982 additions & 796 deletions poetry.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "nautobot-chatops"
version = "2.0.3"
version = "2.1.0"
description = "A plugin providing chatbot capabilities for Nautobot"
authors = ["Network to Code, LLC <[email protected]>"]
readme = "README.md"
Expand Down Expand Up @@ -43,15 +43,15 @@ ipfabric = { version = "~6.0.9", optional = true }
ipfabric-diagrams = { version = "~6.0.2", optional = true }
isodate = { version = "^0.6.1", optional = true }
meraki = { version = "^1.7.2", optional = true }
nautobot = "^1.5.4"
nautobot = "^1.6.2"
nautobot-capacity-metrics = "^2.0.0"
netmiko = { version = "^3.4.0", optional = true }
netmiko = { version = "^4.0.0", optional = true }
netutils = { version = "^1.1.0", optional = true }
pan-os-python = { version = "^1.3.0", optional = true }
prettytable = { version = "^2.1.0", optional = true }
protobuf = { version = "^3.17", optional = true }
pydantic = { version = "^1.8.2", optional = true }
python = "^3.8.0"
python = ">=3.8,<3.12"
requests = ">=2.25.1"
schema-enforcer = { version = "^1.2.1", optional = true }
slack-sdk = "^3.4.2"
Expand Down Expand Up @@ -204,7 +204,7 @@ build-backend = "poetry.core.masonry.api"
[tool.towncrier]
package = "nautobot_chatops"
directory = "changes"
filename = "docs/admin/release_notes/version_2.0.md"
filename = "docs/admin/release_notes/version_2.1.md"
template = "development/towncrier_template.j2"
start_string = "<!-- towncrier release notes start -->"
issue_format = "[#{issue}](https://github.com/nautobot/nautobot-plugin-chatops/issues/{issue})"
Expand Down
15 changes: 14 additions & 1 deletion tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def is_truthy(arg):
namespace.configure(
{
"nautobot_chatops": {
"nautobot_ver": "1.5.4",
"nautobot_ver": "1.6.2",
"project_name": "nautobot-chatops",
"python_ver": "3.8",
"local": False,
Expand Down Expand Up @@ -744,3 +744,16 @@ def connect_awx_container(context, container_name="tools_awx_1"):
bridge_network = f"{context.nautobot_chatops.project_name}_awx"
context.run(f"docker network connect --alias awx {bridge_network} {container_name}")
print(f"Container {container_name} connected to {bridge_network} network")


@task(
help={
"version": "Version of Nautobot ChatOps to generate the release notes for.",
}
)
def generate_release_notes(context, version=""):
"""Generate Release Notes using Towncrier."""
command = "env DJANGO_SETTINGS_MODULE=nautobot.core.settings towncrier build"
if version:
command += f" --version {version}"
run_command(context, command)

0 comments on commit dddb9ed

Please sign in to comment.