Skip to content

Commit

Permalink
🔖 bump version 2024.2 -> 2024.3 (#30)
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuadavidthomas authored Feb 16, 2024
1 parent 800a107 commit 969cb9f
Show file tree
Hide file tree
Showing 13 changed files with 61 additions and 50 deletions.
9 changes: 6 additions & 3 deletions 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.3]

### Changed

- Move from deprecated `ruff` config to new in `pyproject.toml`.
Expand Down Expand Up @@ -79,6 +81,7 @@ Initial release! 🎉

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

[unreleased]: https://github.com/westerveltco/django-twc-project/compare/v2024.1...HEAD
[2024.1]: https://github.com/westerveltco/django-simple-nav/releases/tag/v2024.1
[2024.2]: https://github.com/westerveltco/django-twc-project.git/releases/tag/v2024.2
[unreleased]: https://github.com/westerveltco/django-twc-project/compare/v2024.3...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
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024.2
2024.3
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.2"
default: "2024.3"
when: false

# ----------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions 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: v2024.1-32-g21072fe
_commit: v2024.2-9-ge936eea
_src_path: .
admin_email: [email protected]
author_name: John Doe
Expand All @@ -23,6 +23,6 @@ postgres_docker_version: '15'
project_name: default
python_version: '3.11'
sentry_dsn: https://example.com
sentry_org: example_owner
sentry_org: the-westervelt-company
sentry_project: default
tailwindcss_version: 3.4.0
2 changes: 1 addition & 1 deletion examples/default/.github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
- name: Create Sentry release
uses: getsentry/[email protected]
env:
SENTRY_ORG: "example_owner"
SENTRY_ORG: "the-westervelt-company"
SENTRY_PROJECT: "default"
with:
environment: production
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.2"
__template_version__ = "2024.3"
38 changes: 21 additions & 17 deletions examples/default/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ norecursedirs = ".* bin build dist *.egg htmlcov logs node_modules static templa
python_files = "tests.py test_*.py *_tests.py"

[tool.ruff]
# Allow unused variables when underscore-prefixed.
dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
# Exclude a variety of commonly ignored directories.
exclude = [
".bzr",
Expand All @@ -89,6 +87,7 @@ exclude = [
".git",
".github",
".hg",
".mypy_cache",
".ruff_cache",
".svn",
".tox",
Expand All @@ -99,24 +98,14 @@ exclude = [
"dist",
"migrations",
"node_modules",
"static",
"venv"
]
# Allow autofix for all enabled rules (when `--fix`) is provided.
fixable = ["A", "B", "C", "D", "E", "F", "I"]
ignore = ["E501", "E741"] # temporary
extend-include = ["*.pyi?"]
indent-width = 4
# Same as Black.
line-length = 88
select = [
"B", # flake8-bugbear
"E", # Pycodestyle
"F", # Pyflakes
"I" # isort
]
# Assume Python 3.11.
# Assume Python 3.11
target-version = "py311"
unfixable = []

[tool.ruff.format]
# Like Black, indent with spaces, rather than tabs.
Expand All @@ -126,15 +115,30 @@ line-ending = "auto"
# Like Black, use double quotes for strings.
quote-style = "double"

[tool.ruff.isort]
[tool.ruff.lint]
# Allow unused variables when underscore-prefixed.
dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
# Allow autofix for all enabled rules (when `--fix`) is provided.
fixable = ["A", "B", "C", "D", "E", "F", "I"]
ignore = ["E501", "E741"] # temporary
select = [
"B", # flake8-bugbear
"E", # Pycodestyle
"F", # Pyflakes
"I", # isort
"UP" # pyupgrade
]
unfixable = []

[tool.ruff.lint.isort]
force-single-line = true
known-first-party = ["default"]
required-imports = ["from __future__ import annotations"]

[tool.ruff.per-file-ignores]
[tool.ruff.lint.per-file-ignores]
# Tests can use magic values, assertions, and relative imports
"tests/**/*" = ["PLR2004", "S101", "TID252"]

[tool.ruff.pyupgrade]
[tool.ruff.lint.pyupgrade]
# Preserve types, even if a file imports `from __future__ import annotations`.
keep-runtime-typing = true
4 changes: 2 additions & 2 deletions 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: v2024.1-32-g0acd0b1
_commit: v2024.2-9-gdbeffcc
_src_path: .
admin_email: [email protected]
author_name: John Doe
Expand All @@ -23,6 +23,6 @@ postgres_docker_version: '15'
project_name: with_vite
python_version: '3.11'
sentry_dsn: https://example.com
sentry_org: example_owner
sentry_org: the-westervelt-company
sentry_project: with_vite
tailwindcss_version: 3.4.0
2 changes: 1 addition & 1 deletion examples/with_vite/.github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
- name: Create Sentry release
uses: getsentry/[email protected]
env:
SENTRY_ORG: "example_owner"
SENTRY_ORG: "the-westervelt-company"
SENTRY_PROJECT: "with_vite"
with:
environment: production
Expand Down
38 changes: 21 additions & 17 deletions examples/with_vite/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ norecursedirs = ".* bin build dist *.egg htmlcov logs node_modules static templa
python_files = "tests.py test_*.py *_tests.py"

[tool.ruff]
# Allow unused variables when underscore-prefixed.
dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
# Exclude a variety of commonly ignored directories.
exclude = [
".bzr",
Expand All @@ -89,6 +87,7 @@ exclude = [
".git",
".github",
".hg",
".mypy_cache",
".ruff_cache",
".svn",
".tox",
Expand All @@ -99,24 +98,14 @@ exclude = [
"dist",
"migrations",
"node_modules",
"static",
"venv"
]
# Allow autofix for all enabled rules (when `--fix`) is provided.
fixable = ["A", "B", "C", "D", "E", "F", "I"]
ignore = ["E501", "E741"] # temporary
extend-include = ["*.pyi?"]
indent-width = 4
# Same as Black.
line-length = 88
select = [
"B", # flake8-bugbear
"E", # Pycodestyle
"F", # Pyflakes
"I" # isort
]
# Assume Python 3.11.
# Assume Python 3.11
target-version = "py311"
unfixable = []

[tool.ruff.format]
# Like Black, indent with spaces, rather than tabs.
Expand All @@ -126,15 +115,30 @@ line-ending = "auto"
# Like Black, use double quotes for strings.
quote-style = "double"

[tool.ruff.isort]
[tool.ruff.lint]
# Allow unused variables when underscore-prefixed.
dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
# Allow autofix for all enabled rules (when `--fix`) is provided.
fixable = ["A", "B", "C", "D", "E", "F", "I"]
ignore = ["E501", "E741"] # temporary
select = [
"B", # flake8-bugbear
"E", # Pycodestyle
"F", # Pyflakes
"I", # isort
"UP" # pyupgrade
]
unfixable = []

[tool.ruff.lint.isort]
force-single-line = true
known-first-party = ["with_vite"]
required-imports = ["from __future__ import annotations"]

[tool.ruff.per-file-ignores]
[tool.ruff.lint.per-file-ignores]
# Tests can use magic values, assertions, and relative imports
"tests/**/*" = ["PLR2004", "S101", "TID252"]

[tool.ruff.pyupgrade]
[tool.ruff.lint.pyupgrade]
# Preserve types, even if a file imports `from __future__ import annotations`.
keep-runtime-typing = true
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.2"
__template_version__ = "2024.3"
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.2"
current_version = "2024.3"
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.2"
assert version == "2024.3"


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

assert version == "2024.2"
assert version == "2024.3"

0 comments on commit 969cb9f

Please sign in to comment.