diff --git a/CHANGELOG.md b/CHANGELOG.md index 26b6f9f..0cfc8ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] +## [2024.22] + ### Added - Added ruff to template's `pyproject.toml` under dev extras. @@ -223,7 +225,7 @@ Initial release! 🎉 - Josh Thomas (maintainer) -[unreleased]: https://github.com/westerveltco/django-twc-package/compare/v2024.21...HEAD +[unreleased]: https://github.com/westerveltco/django-twc-package/compare/v2024.22...HEAD [2024.1]: https://github.com/westerveltco/django-twc-package/releases/tag/v2024.1 [2024.2]: https://github.com/westerveltco/django-twc-package/releases/tag/v2024.2 [2024.3]: https://github.com/westerveltco/django-twc-package/releases/tag/v2024.3 @@ -245,3 +247,4 @@ Initial release! 🎉 [2024.19]: https://github.com/westerveltco/django-twc-package/releases/tag/v2024.19 [2024.20]: https://github.com/westerveltco/django-twc-package/releases/tag/v2024.20 [2024.21]: https://github.com/westerveltco/django-twc-package/releases/tag/v2024.21 +[2024.22]: https://github.com/westerveltco/django-twc-package/releases/tag/v2024.22 diff --git a/VERSION b/VERSION index 28c13eb..7cafc77 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2024.21 +2024.22 diff --git a/copier.yml b/copier.yml index f82a291..02a7515 100644 --- a/copier.yml +++ b/copier.yml @@ -11,7 +11,7 @@ _min_copier_version: "9.1.0" _subdirectory: src/django_twc_package template_version: - default: "2024.21" + default: "2024.22" when: false # ---------------------------------------------------------------------- diff --git a/examples/calver_inc/.copier/package.yml b/examples/calver_inc/.copier/package.yml index 36fa19b..6870d7c 100644 --- a/examples/calver_inc/.copier/package.yml +++ b/examples/calver_inc/.copier/package.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: 2c6af1e +_commit: v2024.21-15-g0e1088f _src_path: . author_email: johndoe@example.com author_name: John Doe diff --git a/examples/calver_month/.copier/package.yml b/examples/calver_month/.copier/package.yml index 24a30a0..ccaf14d 100644 --- a/examples/calver_month/.copier/package.yml +++ b/examples/calver_month/.copier/package.yml @@ -1,9 +1,9 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: 621e2dd +_commit: v2024.21-15-g388fbc2 _src_path: . author_email: johndoe@example.com author_name: John Doe -current_version: 2024.8.1 +current_version: 2024.7.1 django_versions: - '4.2' - '5.0' diff --git a/examples/calver_month/RELEASING.md b/examples/calver_month/RELEASING.md index 8016b24..96ccece 100644 --- a/examples/calver_month/RELEASING.md +++ b/examples/calver_month/RELEASING.md @@ -4,7 +4,7 @@ When it comes time to cut a new release, follow these steps: 1. Create a new git branch off of `main` for the release. - Prefer the convention `release-`, where `` is the next incremental version number (e.g. `release-v2024.8.1` for version 2024.8.1). + Prefer the convention `release-`, where `` is the next incremental version number (e.g. `release-v2024.7.1` for version 2024.7.1). ```shell git checkout -b release-v @@ -58,7 +58,7 @@ When it comes time to cut a new release, follow these steps: 6. Draft a [new release](https://github.com/example_owner/calver-mminc1-project/releases/new) on GitHub. - Use the version number with a leading `v` as the tag name (e.g. `v2024.8.1`). + Use the version number with a leading `v` as the tag name (e.g. `v2024.7.1`). Allow GitHub to generate the release title and release notes, using the 'Generate release notes' button above the text box. If this is a final release coming from a tagged release (or multiple tagged releases), make sure to copy the release notes from the previous tagged release(s) to the new release notes (after the release notes already generated for this final release). diff --git a/examples/calver_month/pyproject.toml b/examples/calver_month/pyproject.toml index 0dea5ff..c0da8ed 100644 --- a/examples/calver_month/pyproject.toml +++ b/examples/calver_month/pyproject.toml @@ -74,7 +74,7 @@ Source = "https://github.com/example_owner/calver-mminc1-project" [tool.bumpver] commit = true commit_message = ":bookmark: bump version {old_version} -> {new_version}" -current_version = "2024.8.1" +current_version = "2024.7.1" push = false # set to false for CI tag = false version_pattern = "YYYY.MM.INC1" diff --git a/examples/calver_month/src/calver_mminc1_project/__init__.py b/examples/calver_month/src/calver_mminc1_project/__init__.py index e667960..d6affc4 100644 --- a/examples/calver_month/src/calver_mminc1_project/__init__.py +++ b/examples/calver_month/src/calver_mminc1_project/__init__.py @@ -1,3 +1,3 @@ from __future__ import annotations -__version__ = "2024.8.1" +__version__ = "2024.7.1" diff --git a/examples/calver_month/tests/test_version.py b/examples/calver_month/tests/test_version.py index 8cd38c4..21e4743 100644 --- a/examples/calver_month/tests/test_version.py +++ b/examples/calver_month/tests/test_version.py @@ -4,4 +4,4 @@ def test_version(): - assert __version__ == "2024.8.1" + assert __version__ == "2024.7.1" diff --git a/examples/default/.copier/package.yml b/examples/default/.copier/package.yml index 2c9ab11..10b68be 100644 --- a/examples/default/.copier/package.yml +++ b/examples/default/.copier/package.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: b192c14 +_commit: v2024.21-15-g3337007 _src_path: . author_email: johndoe@example.com author_name: John Doe diff --git a/pyproject.toml b/pyproject.toml index db2ce73..de38253 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ requires-python = ">= 3.8" [tool.bumpver] commit = true commit_message = ":bookmark: bump version {old_version} -> {new_version}" -current_version = "2024.21" +current_version = "2024.22" push = false # set to false for CI tag = false version_pattern = "YYYY.INC1" diff --git a/tests/test_version.py b/tests/test_version.py index eebdbea..f8ad3eb 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -14,7 +14,7 @@ def test_copier_yml_version(): version = copier_yml["template_version"]["default"] - assert version == "2024.21" + assert version == "2024.22" def test_VERSION_version(): @@ -22,4 +22,4 @@ def test_VERSION_version(): with open(file, encoding="utf-8") as f: version = f.read().strip() - assert version == "2024.21" + assert version == "2024.22"