diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b59d8947..d8658bb3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }}" diff --git a/changes/273.fixed b/changes/273.fixed deleted file mode 100644 index c450eee3..00000000 --- a/changes/273.fixed +++ /dev/null @@ -1 +0,0 @@ -Fixed dependency resolution issues with latest release of golden config. \ No newline at end of file diff --git a/docs/admin/compatibility_matrix.md b/docs/admin/compatibility_matrix.md index c9b12d1a..69c9d50f 100644 --- a/docs/admin/compatibility_matrix.md +++ b/docs/admin/compatibility_matrix.md @@ -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] | diff --git a/docs/admin/release_notes/version_2.1.md b/docs/admin/release_notes/version_2.1.md new file mode 100644 index 00000000..00cdf009 --- /dev/null +++ b/docs/admin/release_notes/version_2.1.md @@ -0,0 +1,9 @@ + +# v2.1 Release Notes + + +## [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. diff --git a/docs/dev/release_checklist.md b/docs/dev/release_checklist.md index d31d8c4f..f859c96c 100644 --- a/docs/dev/release_checklist.md +++ b/docs/dev/release_checklist.md @@ -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`). diff --git a/mkdocs.yml b/mkdocs.yml index 8ead7041..200a6e06 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -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" diff --git a/pyproject.toml b/pyproject.toml index 66f0ed33..ad64a549 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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 = "" issue_format = "[#{issue}](https://github.com/nautobot/nautobot-plugin-chatops/issues/{issue})" diff --git a/tasks.py b/tasks.py index 12d3259c..87eb91a0 100644 --- a/tasks.py +++ b/tasks.py @@ -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, @@ -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)