Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🔖 bump version 2024.21 -> 2024.22 #100

Merged
merged 3 commits into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -223,7 +225,7 @@ Initial release! 🎉

- Josh Thomas <josh@joshthomas.dev> (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
Expand All @@ -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
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024.21
2024.22
2 changes: 1 addition & 1 deletion copier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

# ----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion examples/calver_inc/.copier/package.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/calver_month/.copier/package.yml
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
4 changes: 2 additions & 2 deletions examples/calver_month/RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-<version>`, where `<version>` is the next incremental version number (e.g. `release-v2024.8.1` for version 2024.8.1).
Prefer the convention `release-<version>`, where `<version>` is the next incremental version number (e.g. `release-v2024.7.1` for version 2024.7.1).

```shell
git checkout -b release-v<version>
Expand Down Expand Up @@ -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).

Expand Down
2 changes: 1 addition & 1 deletion examples/calver_month/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from __future__ import annotations

__version__ = "2024.8.1"
__version__ = "2024.7.1"
2 changes: 1 addition & 1 deletion examples/calver_month/tests/test_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@


def test_version():
assert __version__ == "2024.8.1"
assert __version__ == "2024.7.1"
2 changes: 1 addition & 1 deletion examples/default/.copier/package.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions tests/test_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ def test_copier_yml_version():

version = copier_yml["template_version"]["default"]

assert version == "2024.21"
assert version == "2024.22"


def test_VERSION_version():
file = BASE_DIR / "VERSION"
with open(file, encoding="utf-8") as f:
version = f.read().strip()

assert version == "2024.21"
assert version == "2024.22"