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.

Sign up for GitHub

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

[pull] master from cookiecutter:master #640

Merged
merged 3 commits into from
Sep 22, 2023
Merged

[pull] master from cookiecutter:master #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3666490
Update djlint to 1.34.0 (#4590)
pyup-bot Sep 21, 2023
a47146f
Auto-update pre-commit hooks (#4589)
github-actions[bot] Sep 21, 2023
38d509c
Release 2023.09.21
actions-user Sep 22, 2023
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ repos:
args: ["--tab-width", "2"]

- repo: https://github.com/asottile/pyupgrade
rev: v3.11.0
rev: v3.11.1
hooks:
- id: pyupgrade
args: [--py311-plus]
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f

<!-- GENERATOR_PLACEHOLDER -->

## 2023.09.21


### Updated

- Auto-update pre-commit hooks ([#4589](https://github.com/cookiecutter/cookiecutter-django/pull/4589))

- Update djlint to 1.34.0 ([#4590](https://github.com/cookiecutter/cookiecutter-django/pull/4590))

## 2023.09.19


Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ black==23.9.1
isort==5.12.0
flake8==6.1.0
django-upgrade==1.14.1
djlint==1.33.0
djlint==1.34.0
pre-commit==3.4.0

# Testing
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from distutils.core import setup

# We use calendar versioning
version = "2023.09.19"
version = "2023.09.21"

with open("README.md") as readme_file:
long_description = readme_file.read()
Expand Down
4 changes: 2 additions & 2 deletions {{cookiecutter.project_slug}}/.pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ repos:
args: ['--target-version', '4.2']

- repo: https://github.com/asottile/pyupgrade
rev: v3.11.0
rev: v3.11.1
hooks:
- id: pyupgrade
args: [--py311-plus]
Expand All @@ -52,7 +52,7 @@ repos:
- id: flake8

- repo: https://github.com/Riverside-Healthcare/djLint
rev: v1.33.0
rev: v1.34.0
hooks:
- id: djlint-reformat-django
- id: djlint-django
Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/requirements/local.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ flake8==6.1.0 # https://github.com/PyCQA/flake8
flake8-isort==6.1.0 # https://github.com/gforcada/flake8-isort
coverage==7.3.1 # https://github.com/nedbat/coveragepy
black==23.9.1 # https://github.com/psf/black
djlint==1.33.0 # https://github.com/Riverside-Healthcare/djLint
djlint==1.34.0 # https://github.com/Riverside-Healthcare/djLint
pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django
{%- if cookiecutter.use_celery == 'y' %}
pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery
Expand Down