Skip to content

Commit

Permalink
🔖 bump version 2024.5 -> 2024.6 (#53)
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuadavidthomas authored Feb 21, 2024
1 parent 024af9d commit 9c96f44
Show file tree
Hide file tree
Showing 17 changed files with 130 additions and 125 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]

## [2024.6]

### Fixed

- The release link and text in the `README.md` was not referencing the correct SaaS product.

## [2024.5]

### Added
Expand Down Expand Up @@ -108,9 +114,10 @@ Initial release! 🎉

- Josh Thomas <[email protected]> (maintainer)

[unreleased]: https://github.com/westerveltco/django-twc-project/compare/v2024.5...HEAD
[unreleased]: https://github.com/westerveltco/django-twc-project/compare/v2024.6...HEAD
[2024.1]: https://github.com/westerveltco/django-twc-project/releases/tag/v2024.1
[2024.2]: https://github.com/westerveltco/django-twc-project/releases/tag/v2024.2
[2024.3]: https://github.com/westerveltco/django-twc-project/releases/tag/v2024.3
[2024.4]: https://github.com/westerveltco/django-twc-project/releases/tag/v2024.4
[2024.5]: https://github.com/westerveltco/django-twc-project/releases/tag/v2024.5
[2024.6]: https://github.com/westerveltco/django-twc-project/releases/tag/v2024.6
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024.5
2024.6
2 changes: 1 addition & 1 deletion copier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ _secret_questions:
_subdirectory: src/django_twc_project

template_version:
default: "2024.5"
default: "2024.6"
when: false

# ----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion examples/default/.copier/project.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: 63cb2e6
_commit: v2024.5-5-g957d660
_src_path: .
admin_email: [email protected]
author_name: John Doe
Expand Down
2 changes: 1 addition & 1 deletion examples/default/default/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from __future__ import annotations

__version__ = "2024.2.1"
__template_version__ = "2024.5"
__template_version__ = "2024.6"
28 changes: 14 additions & 14 deletions examples/default/templates/404.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{% extends "base.html" %}
{% block content %}
<h1>404</h1>
<p>Oops! The page you're looking for can't be found.</p>
<p>
It looks like the page you were trying to reach doesn't exist or has been moved. Don't worry, this happens to the best of us.
</p>
<p>Here are some helpful links to get you back on track:</p>
<ul>
<li>Homepage: [Your Website URL]</li>
<li>About Us: [Your Website URL]/about-us</li>
<li>Contact Us: [Your Website URL]/contact-us</li>
</ul>
<p>
If you still can't find what you're looking for, feel free to reach out to us at [Your Support Email]. We're always here to help.
</p>
<h1>404</h1>
<p>Oops! The page you're looking for can't be found.</p>
<p>
It looks like the page you were trying to reach doesn't exist or has been moved. Don't worry, this happens to the best of us.
</p>
<p>Here are some helpful links to get you back on track:</p>
<ul>
<li>Homepage: [Your Website URL]</li>
<li>About Us: [Your Website URL]/about-us</li>
<li>Contact Us: [Your Website URL]/contact-us</li>
</ul>
<p>
If you still can't find what you're looking for, feel free to reach out to us at [Your Support Email]. We're always here to help.
</p>
{% endblock content %}
121 changes: 60 additions & 61 deletions examples/default/templates/base.html
Original file line number Diff line number Diff line change
@@ -1,37 +1,36 @@

{% load static %}
{% load django_htmx %}
{% load tailwind_cli %}
<!DOCTYPE html>
<html lang="en" class="h-full">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1">
<title>
{% block title %}
Default
{% endblock title %}
</title>
<meta name="description" content="">
<meta name="author" content="">
{% block css %}
{% endblock css %}
{% tailwind_css %}
<script src="https://unpkg.com/[email protected]"
integrity="sha384-D1Kt99CQMDuVetoL1lrYwg5t+9QdHe7NLX/SoJYkXDFfX37iInKRy5xLSi8nO7UC"
crossorigin="anonymous"></script>
<script src="https://unpkg.com/htmx.org/dist/ext/head-support.js"
integrity="sha384-CtqhRhV1bHrqMSWc8cQGQL4epjUqCHjq/kJ9ztGHS39vO/1phOgyhFIieE87UKMu"
crossorigin="anonymous"></script>
<script src="https://unpkg.com/[email protected]"
integrity="sha384-tg/2Ca9U/RohyxmGCb8qJVR3j9cswtKbdRSXOaPX/aDDOW1bfbeyV+7G9ifYF4bC"
crossorigin="anonymous"></script>
<script src="https://unpkg.com/htmx.org/dist/ext/preload.js"
integrity="sha384-NoiTdF/KjxH4wa6OHMdM4F6e/LIPNMcFBgOIINTTaczWo0vX1mWTOzckySqlGQS/"
crossorigin="anonymous"></script>
{% django_htmx_script %}
{% if debug %}
<script>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1">
<title>
{% block title %}
Default
{% endblock title %}
</title>
<meta name="description" content="">
<meta name="author" content="">
{% block css %}
{% endblock css %}
{% tailwind_css %}
<script src="https://unpkg.com/[email protected]"
integrity="sha384-D1Kt99CQMDuVetoL1lrYwg5t+9QdHe7NLX/SoJYkXDFfX37iInKRy5xLSi8nO7UC"
crossorigin="anonymous"></script>
<script src="https://unpkg.com/htmx.org/dist/ext/head-support.js"
integrity="sha384-CtqhRhV1bHrqMSWc8cQGQL4epjUqCHjq/kJ9ztGHS39vO/1phOgyhFIieE87UKMu"
crossorigin="anonymous"></script>
<script src="https://unpkg.com/[email protected]"
integrity="sha384-tg/2Ca9U/RohyxmGCb8qJVR3j9cswtKbdRSXOaPX/aDDOW1bfbeyV+7G9ifYF4bC"
crossorigin="anonymous"></script>
<script src="https://unpkg.com/htmx.org/dist/ext/preload.js"
integrity="sha384-NoiTdF/KjxH4wa6OHMdM4F6e/LIPNMcFBgOIINTTaczWo0vX1mWTOzckySqlGQS/"
crossorigin="anonymous"></script>
{% django_htmx_script %}
{% if debug %}
<script>
if (typeof window.htmx !== "undefined") {
htmx.on("htmx:afterSettle", function(detail) {
if (
Expand All @@ -46,36 +45,36 @@
}
});
}
</script>
{% endif %}
<script defer
src="https://unpkg.com/@alpinejs/[email protected]"
integrity="sha384-BOC0hrQPTXQv3X+4j0CDVtDdBplQLPPs6KJfKnc3r7/DNlbvpd9EjykBWP/sNH9v"
crossorigin="anonymous"></script>
<script defer
src="https://unpkg.com/@alpinejs/[email protected]"
integrity="sha384-2OH1oWuzGQTwIVsefc3w96FepRDcaddeEJiyo8ZXCQA4jP7C4mQMdI70jDKtgq0R"
crossorigin="anonymous"></script>
<script defer
src="https://unpkg.com/@alpinejs/[email protected]"
integrity="sha384-KbHuoVQjZqKnY0E8Zy6AadqsgGJwz0QYY5kk9XyFE2GTDeOqNYsSBDLCNOuSwcis"
crossorigin="anonymous"></script>
<script defer
src="https://unpkg.com/[email protected]"
integrity="sha384-Rpe/8orFUm5Q1GplYBHxbuA8Az8O8C5sAoOsdbRWkqPjKFaxPgGZipj4zeHL7lxX"
crossorigin="anonymous"></script>
{% block javascript_head %}
{% endblock javascript_head %}
</head>
{% block body %}
<body {% if debug %}class="debug-screens"{% endif %}
hx-ext="head-support, preload">
<main class="mt-16">
{% block content %}
{% endblock content %}
</main>
{% block javascript_foot %}
{% endblock javascript_foot %}
</body>
{% endblock body %}
</script>
{% endif %}
<script defer
src="https://unpkg.com/@alpinejs/[email protected]"
integrity="sha384-BOC0hrQPTXQv3X+4j0CDVtDdBplQLPPs6KJfKnc3r7/DNlbvpd9EjykBWP/sNH9v"
crossorigin="anonymous"></script>
<script defer
src="https://unpkg.com/@alpinejs/[email protected]"
integrity="sha384-2OH1oWuzGQTwIVsefc3w96FepRDcaddeEJiyo8ZXCQA4jP7C4mQMdI70jDKtgq0R"
crossorigin="anonymous"></script>
<script defer
src="https://unpkg.com/@alpinejs/[email protected]"
integrity="sha384-KbHuoVQjZqKnY0E8Zy6AadqsgGJwz0QYY5kk9XyFE2GTDeOqNYsSBDLCNOuSwcis"
crossorigin="anonymous"></script>
<script defer
src="https://unpkg.com/[email protected]"
integrity="sha384-Rpe/8orFUm5Q1GplYBHxbuA8Az8O8C5sAoOsdbRWkqPjKFaxPgGZipj4zeHL7lxX"
crossorigin="anonymous"></script>
{% block javascript_head %}
{% endblock javascript_head %}
</head>
{% block body %}
<body {% if debug %}class="debug-screens"{% endif %}
hx-ext="head-support, preload">
<main class="mt-16">
{% block content %}
{% endblock content %}
</main>
{% block javascript_foot %}
{% endblock javascript_foot %}
</body>
{% endblock body %}
</html>
8 changes: 4 additions & 4 deletions examples/default/templates/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{% block content %}
<h1>Index</h1>
<p>
Lorem ipsum dolor sit amet, officia excepteur ex fugiat reprehenderit enim labore culpa sint ad nisi Lorem pariatur mollit ex esse exercitation amet. Nisi anim cupidatat excepteur officia. Reprehenderit nostrud nostrud ipsum Lorem est aliquip amet voluptate voluptate dolor minim nulla est proident. Nostrud officia pariatur ut officia. Sit irure elit esse ea nulla sunt ex occaecat reprehenderit commodo officia dolor Lorem duis laboris cupidatat officia voluptate. Culpa proident adipisicing id nulla nisi laboris ex in Lorem sunt duis officia eiusmod. Aliqua reprehenderit commodo ex non excepteur duis sunt velit enim. Voluptate laboris sint cupidatat ullamco ut ea consectetur et est culpa et culpa duis.
</p>
<h1>Index</h1>
<p>
Lorem ipsum dolor sit amet, officia excepteur ex fugiat reprehenderit enim labore culpa sint ad nisi Lorem pariatur mollit ex esse exercitation amet. Nisi anim cupidatat excepteur officia. Reprehenderit nostrud nostrud ipsum Lorem est aliquip amet voluptate voluptate dolor minim nulla est proident. Nostrud officia pariatur ut officia. Sit irure elit esse ea nulla sunt ex occaecat reprehenderit commodo officia dolor Lorem duis laboris cupidatat officia voluptate. Culpa proident adipisicing id nulla nisi laboris ex in Lorem sunt duis officia eiusmod. Aliqua reprehenderit commodo ex non excepteur duis sunt velit enim. Voluptate laboris sint cupidatat ullamco ut ea consectetur et est culpa et culpa duis.
</p>
{% endblock content %}
2 changes: 1 addition & 1 deletion examples/with_vite/.copier/project.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: e6a03d3
_commit: v2024.5-5-gfd39f6e
_src_path: .
admin_email: [email protected]
author_name: John Doe
Expand Down
6 changes: 3 additions & 3 deletions examples/with_vite/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ tag = false
version_pattern = "YYYY.MM.INC1"

[tool.bumpver.file_patterns]
"with_vite/__init__.py" = [
'__version__ = "{version}"'
]
"tests/test_version.py" = [
'assert __version__ == "{version}"'
]
"with_vite/__init__.py" = [
'__version__ = "{version}"'
]

[tool.coverage.report]
exclude_lines = [
Expand Down
28 changes: 14 additions & 14 deletions examples/with_vite/templates/404.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{% extends "base.html" %}
{% block content %}
<h1>404</h1>
<p>Oops! The page you're looking for can't be found.</p>
<p>
It looks like the page you were trying to reach doesn't exist or has been moved. Don't worry, this happens to the best of us.
</p>
<p>Here are some helpful links to get you back on track:</p>
<ul>
<li>Homepage: [Your Website URL]</li>
<li>About Us: [Your Website URL]/about-us</li>
<li>Contact Us: [Your Website URL]/contact-us</li>
</ul>
<p>
If you still can't find what you're looking for, feel free to reach out to us at [Your Support Email]. We're always here to help.
</p>
<h1>404</h1>
<p>Oops! The page you're looking for can't be found.</p>
<p>
It looks like the page you were trying to reach doesn't exist or has been moved. Don't worry, this happens to the best of us.
</p>
<p>Here are some helpful links to get you back on track:</p>
<ul>
<li>Homepage: [Your Website URL]</li>
<li>About Us: [Your Website URL]/about-us</li>
<li>Contact Us: [Your Website URL]/contact-us</li>
</ul>
<p>
If you still can't find what you're looking for, feel free to reach out to us at [Your Support Email]. We're always here to help.
</p>
{% endblock content %}
28 changes: 14 additions & 14 deletions examples/with_vite/templates/500.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{% extends "base.html" %}
{% block content %}
<h1>500</h1>
<p>Uh oh! Something went wrong on our end.</p>
<p>
We're sorry, but there seems to have been an error while processing your request. Our team has been notified and is working to resolve the issue as quickly as possible.
</p>
<p>In the meantime, please try one of the following options:</p>
<ul>
<li>Refresh the page: Simply clicking the refresh button in your browser may resolve the issue.</li>
<li>Try again later: The issue may be temporary, so please try again later.</li>
<li>
Contact us: If the problem persists, please contact us at [Your Support Email]. Our team will be more than happy to assist you.
</li>
</ul>
<p>We apologize for the inconvenience and appreciate your patience as we work to resolve this issue.</p>
<h1>500</h1>
<p>Uh oh! Something went wrong on our end.</p>
<p>
We're sorry, but there seems to have been an error while processing your request. Our team has been notified and is working to resolve the issue as quickly as possible.
</p>
<p>In the meantime, please try one of the following options:</p>
<ul>
<li>Refresh the page: Simply clicking the refresh button in your browser may resolve the issue.</li>
<li>Try again later: The issue may be temporary, so please try again later.</li>
<li>
Contact us: If the problem persists, please contact us at [Your Support Email]. Our team will be more than happy to assist you.
</li>
</ul>
<p>We apologize for the inconvenience and appreciate your patience as we work to resolve this issue.</p>
{% endblock content %}
1 change: 0 additions & 1 deletion examples/with_vite/templates/base.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

{% load static %}
{% load django_htmx %}
{% load tailwind_cli %}
Expand Down
8 changes: 4 additions & 4 deletions examples/with_vite/templates/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{% block content %}
<h1>Index</h1>
<p>
Lorem ipsum dolor sit amet, officia excepteur ex fugiat reprehenderit enim labore culpa sint ad nisi Lorem pariatur mollit ex esse exercitation amet. Nisi anim cupidatat excepteur officia. Reprehenderit nostrud nostrud ipsum Lorem est aliquip amet voluptate voluptate dolor minim nulla est proident. Nostrud officia pariatur ut officia. Sit irure elit esse ea nulla sunt ex occaecat reprehenderit commodo officia dolor Lorem duis laboris cupidatat officia voluptate. Culpa proident adipisicing id nulla nisi laboris ex in Lorem sunt duis officia eiusmod. Aliqua reprehenderit commodo ex non excepteur duis sunt velit enim. Voluptate laboris sint cupidatat ullamco ut ea consectetur et est culpa et culpa duis.
</p>
<h1>Index</h1>
<p>
Lorem ipsum dolor sit amet, officia excepteur ex fugiat reprehenderit enim labore culpa sint ad nisi Lorem pariatur mollit ex esse exercitation amet. Nisi anim cupidatat excepteur officia. Reprehenderit nostrud nostrud ipsum Lorem est aliquip amet voluptate voluptate dolor minim nulla est proident. Nostrud officia pariatur ut officia. Sit irure elit esse ea nulla sunt ex occaecat reprehenderit commodo officia dolor Lorem duis laboris cupidatat officia voluptate. Culpa proident adipisicing id nulla nisi laboris ex in Lorem sunt duis officia eiusmod. Aliqua reprehenderit commodo ex non excepteur duis sunt velit enim. Voluptate laboris sint cupidatat ullamco ut ea consectetur et est culpa et culpa duis.
</p>
{% endblock content %}
2 changes: 1 addition & 1 deletion examples/with_vite/with_vite/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from __future__ import annotations

__version__ = "2024.2.1"
__template_version__ = "2024.5"
__template_version__ = "2024.6"
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ requires-python = ">= 3.8"
[tool.bumpver]
commit = true
commit_message = ":bookmark: bump version {old_version} -> {new_version}"
current_version = "2024.5"
current_version = "2024.6"
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.5"
assert version == "2024.6"


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

assert version == "2024.5"
assert version == "2024.6"

0 comments on commit 9c96f44

Please sign in to comment.