From b1a260e807c70212b966b9176822366a6a050e25 Mon Sep 17 00:00:00 2001 From: bakebot Date: Fri, 15 Mar 2024 12:20:03 +0000 Subject: [PATCH 1/2] Cookie updated by NetworkToCode Cookie Drift Manager Tool Template: ``` { "template": "https://github.com/nautobot/cookiecutter-nautobot-app.git", "dir": "nautobot-app", "ref": "refs/tags/nautobot-app-v2.2.1", "path": null } ``` Cookie: ``` { "remote": "https://github.com/nautobot/nautobot-app-dev-example.git", "path": "/tmp/tmp06npvtmn/nautobot-app-dev-example", "repository_path": "/tmp/tmp06npvtmn/nautobot-app-dev-example", "dir": "", "branch_prefix": "drift-manager", "context": { "codeowner_github_usernames": "@cmsirbu @snaselj @whitej6", "full_name": "Network to Code, LLC", "email": "opensource@networktocode.com", "github_org": "nautobot", "app_name": "nautobot_dev_example", "verbose_name": "Nautobot Dev Example App", "app_slug": "nautobot-dev-example", "project_slug": "nautobot-app-dev-example", "repo_url": "https://github.com/nautobot/nautobot-app-dev-example", "base_url": "dev-example", "min_nautobot_version": "2.0.0", "max_nautobot_version": "2.9999", "camel_name": "NautobotDevExample", "project_short_description": "Nautobot App to demonstrate how to create a Nautobot App.", "model_class_name": "DevExample", "open_source_license": "Apache-2.0", "docs_base_url": "https://docs.nautobot.com", "docs_app_url": "https://docs.nautobot.com/projects/dev-example/en/latest", "_template": "https://github.com/nautobot/cookiecutter-nautobot-app.git", "_output_dir": "/tmp/tmp06npvtmn", "_repo_dir": "/github/home/.cookiecutters/cookiecutter-nautobot-app/nautobot-app", "_checkout": "refs/tags/nautobot-app-v2.2.1" }, "base_branch": "develop", "remote_name": "origin", "pull_request_strategy": "PullRequestStrategy.CREATE", "post_actions": [ "PostAction.BLACK" ], "baked_commit_ref": "5e00039e8b807a6ac14c2b3b4fcea559d3bb09af", "draft": false } ``` CLI Arguments: ``` { "cookie_dir": "", "input": false, "json_filename": "", "output_dir": "", "push": true, "template": "", "template_dir": "", "template_ref": "refs/tags/nautobot-app-v2.2.1", "pull_request": null, "post_action": [], "disable_post_actions": false, "draft": null } ``` --- .cookiecutter.json | 4 ++-- development/towncrier_template.j2 | 2 +- docs/dev/contributing.md | 20 +++++++++---------- .../devexample_retrieve.html | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.cookiecutter.json b/.cookiecutter.json index 99e162b..e669ed8 100644 --- a/.cookiecutter.json +++ b/.cookiecutter.json @@ -21,7 +21,7 @@ "_drift_manager": { "template": "https://github.com/nautobot/cookiecutter-nautobot-app.git", "template_dir": "nautobot-app", - "template_ref": "refs/tags/nautobot-app-v2.2.0", + "template_ref": "refs/tags/nautobot-app-v2.2.1", "cookie_dir": "", "branch_prefix": "drift-manager", "pull_request_strategy": "create", @@ -29,7 +29,7 @@ "black" ], "draft": false, - "baked_commit_ref": "5e00039e8b807a6ac14c2b3b4fcea559d3bb09af" + "baked_commit_ref": "7aac1f0522733f35272ec3f80751e54e059ce881" } } } diff --git a/development/towncrier_template.j2 b/development/towncrier_template.j2 index b0f6e12..8e04c99 100644 --- a/development/towncrier_template.j2 +++ b/development/towncrier_template.j2 @@ -1,6 +1,6 @@ {% if render_title %} -## [v{{ versiondata.version }} ({{ versiondata.date }})]({{ cookiecutter.repo_url }}/releases/tag/v{{ versiondata.version}}) +## [v{{ versiondata.version }} ({{ versiondata.date }})](https://github.com/nautobot/nautobot-app-dev-example/releases/tag/v{{ versiondata.version}}) {% endif %} {% for section, _ in sections.items() %} diff --git a/docs/dev/contributing.md b/docs/dev/contributing.md index dad0590..8a674ee 100644 --- a/docs/dev/contributing.md +++ b/docs/dev/contributing.md @@ -47,7 +47,7 @@ The branching policy includes the following tenets: - PRs intended to add new features should be sourced from the `develop` branch. - PRs intended to fix issues in the Nautobot LTM compatible release should be sourced from the latest `ltm-` branch instead of `develop`. -Nautobot Dev Example App will observe semantic versioning, as of 1.0. This may result in a quick turnaround in minor versions to keep pace with an ever growing feature set. +Nautobot Dev Example App will observe semantic versioning, as of 1.0. This may result in a quick turnaround in minor versions to keep pace with an ever-growing feature set. ## Release Policy @@ -56,17 +56,17 @@ Nautobot Dev Example App has currently no intended scheduled release schedule, a When a new release, from `develop` to `main`, is created the following should happen. - A release PR is created from `develop` with: - - Update the release notes in `docs/admin/release_notes/version_..md` file to reflect the changes. - - Change the version from `..-beta` to `..` in `pyproject.toml`. - - Set the PR to the `main` branch. + - Update the release notes in `docs/admin/release_notes/version_..md` file to reflect the changes. + - Change the version from `..-beta` to `..` in `pyproject.toml`. + - Set the PR to the `main` branch. - Ensure the tests for the PR pass. - Merge the PR. - Create a new tag: - - The tag should be in the form of `v..`. - - The title should be in the form of `v..`. - - The description should be the changes that were added to the `version_..md` document. + - The tag should be in the form of `v..`. + - The title should be in the form of `v..`. + - The description should be the changes that were added to the `version_..md` document. - If merged into `main`, then push from `main` to `develop`, in order to retain the merge commit created when the PR was merged - A post release PR is created with: - - Change the version from `..` to `..-beta` in both `pyproject.toml` and `nautobot.__init__.__version__`. - - Set the PR to the proper branch, `develop`. - - Once tests pass, merge. + - Change the version from `..` to `..-beta` in both `pyproject.toml` and `nautobot.__init__.__version__`. + - Set the PR to the proper branch, `develop`. + - Once tests pass, merge. diff --git a/nautobot_dev_example/templates/nautobot_dev_example/devexample_retrieve.html b/nautobot_dev_example/templates/nautobot_dev_example/devexample_retrieve.html index 4a58b9b..25dbbe8 100644 --- a/nautobot_dev_example/templates/nautobot_dev_example/devexample_retrieve.html +++ b/nautobot_dev_example/templates/nautobot_dev_example/devexample_retrieve.html @@ -22,5 +22,5 @@ -{% endblock %} +{% endblock content_left_page %} From 5085744ca2dac959c10f96be9de3823db2f917d3 Mon Sep 17 00:00:00 2001 From: Jan Snasel Date: Fri, 15 Mar 2024 12:32:48 +0000 Subject: [PATCH 2/2] chore: Added changelog fragment --- changes/9.housekeeping | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/9.housekeeping diff --git a/changes/9.housekeeping b/changes/9.housekeeping new file mode 100644 index 0000000..653c54a --- /dev/null +++ b/changes/9.housekeeping @@ -0,0 +1 @@ +Re-baked from the latest template.