mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2025-09-21 19:32:34 +03:00
Merge branch 'cookiecutter-master'
This commit is contained in:
commit
0ed37b8060
|
@ -17,7 +17,7 @@ repos:
|
|||
- id: detect-private-key
|
||||
|
||||
- repo: https://github.com/pre-commit/mirrors-prettier
|
||||
rev: "v3.0.2"
|
||||
rev: "v3.0.3"
|
||||
hooks:
|
||||
- id: prettier
|
||||
args: ["--tab-width", "2"]
|
||||
|
|
39
CHANGELOG.md
39
CHANGELOG.md
|
@ -3,6 +3,45 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
|
|||
|
||||
<!-- GENERATOR_PLACEHOLDER -->
|
||||
|
||||
## 2023.09.03
|
||||
|
||||
|
||||
### Updated
|
||||
|
||||
- Update celery to 5.3.4 ([#4562](https://github.com/cookiecutter/cookiecutter-django/pull/4562))
|
||||
|
||||
## 2023.09.02
|
||||
|
||||
|
||||
### Updated
|
||||
|
||||
- Update pytest to 7.4.1 ([#4561](https://github.com/cookiecutter/cookiecutter-django/pull/4561))
|
||||
|
||||
- Update pre-commit to 3.4.0 ([#4560](https://github.com/cookiecutter/cookiecutter-django/pull/4560))
|
||||
|
||||
- Update django-environ to 0.11.2 ([#4558](https://github.com/cookiecutter/cookiecutter-django/pull/4558))
|
||||
|
||||
## 2023.09.01
|
||||
|
||||
|
||||
## 2023.08.31
|
||||
|
||||
|
||||
### Updated
|
||||
|
||||
- Auto-update pre-commit hooks ([#4550](https://github.com/cookiecutter/cookiecutter-django/pull/4550))
|
||||
|
||||
- Update django-allauth to 0.55.2 ([#4549](https://github.com/cookiecutter/cookiecutter-django/pull/4549))
|
||||
|
||||
- Update celery to 5.3.3 ([#4553](https://github.com/cookiecutter/cookiecutter-django/pull/4553))
|
||||
|
||||
## 2023.08.30
|
||||
|
||||
|
||||
### Updated
|
||||
|
||||
- Update django-environ to 0.11.0 ([#4548](https://github.com/cookiecutter/cookiecutter-django/pull/4548))
|
||||
|
||||
## 2023.08.29
|
||||
|
||||
|
||||
|
|
|
@ -9,12 +9,12 @@ isort==5.12.0
|
|||
flake8==6.1.0
|
||||
django-upgrade==1.14.1
|
||||
djlint==1.32.1
|
||||
pre-commit==3.3.3
|
||||
pre-commit==3.4.0
|
||||
|
||||
# Testing
|
||||
# ------------------------------------------------------------------------------
|
||||
tox==4.9.0
|
||||
pytest==7.4.0
|
||||
tox==4.11.1
|
||||
pytest==7.4.1
|
||||
pytest-xdist==3.3.1
|
||||
pytest-cookies==0.7.0
|
||||
pytest-instafail==0.5.0
|
||||
|
@ -23,6 +23,6 @@ pyyaml==6.0.1
|
|||
# Scripting
|
||||
# ------------------------------------------------------------------------------
|
||||
PyGithub==1.59.1
|
||||
gitpython==3.1.32
|
||||
gitpython==3.1.34
|
||||
jinja2==3.1.2
|
||||
requests==2.31.0
|
||||
|
|
2
setup.py
2
setup.py
|
@ -5,7 +5,7 @@ except ImportError:
|
|||
from distutils.core import setup
|
||||
|
||||
# We use calendar versioning
|
||||
version = "2023.08.29"
|
||||
version = "2023.09.03"
|
||||
|
||||
with open("README.md") as readme_file:
|
||||
long_description = readme_file.read()
|
||||
|
|
|
@ -18,7 +18,7 @@ repos:
|
|||
- id: detect-private-key
|
||||
|
||||
- repo: https://github.com/pre-commit/mirrors-prettier
|
||||
rev: v3.0.2
|
||||
rev: v3.0.3
|
||||
hooks:
|
||||
- id: prettier
|
||||
args: ['--tab-width', '2', '--single-quote']
|
||||
|
|
|
@ -16,7 +16,7 @@ redis==5.0.0 # https://github.com/redis/redis-py
|
|||
hiredis==2.2.3 # https://github.com/redis/hiredis-py
|
||||
{%- endif %}
|
||||
{%- if cookiecutter.use_celery == "y" %}
|
||||
celery==5.3.1 # pyup: < 6.0 # https://github.com/celery/celery
|
||||
celery==5.3.4 # pyup: < 6.0 # https://github.com/celery/celery
|
||||
django-celery-beat==2.5.0 # https://github.com/celery/django-celery-beat
|
||||
{%- if cookiecutter.use_docker == 'y' %}
|
||||
flower==2.0.1 # https://github.com/mher/flower
|
||||
|
@ -28,10 +28,10 @@ uvicorn[standard]==0.23.2 # https://github.com/encode/uvicorn
|
|||
|
||||
# Django
|
||||
# ------------------------------------------------------------------------------
|
||||
django==4.2.4 # pyup: < 5.0 # https://www.djangoproject.com/
|
||||
django-environ==0.11.0 # https://github.com/joke2k/django-environ
|
||||
django==4.2.5 # pyup: < 5.0 # https://www.djangoproject.com/
|
||||
django-environ==0.11.2 # https://github.com/joke2k/django-environ
|
||||
django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils
|
||||
django-allauth==0.55.0 # https://github.com/pennersr/django-allauth
|
||||
django-allauth==0.55.2 # https://github.com/pennersr/django-allauth
|
||||
django-crispy-forms==2.0 # https://github.com/django-crispy-forms/django-crispy-forms
|
||||
crispy-bootstrap5==0.7 # https://github.com/django-crispy-forms/crispy-bootstrap5
|
||||
{%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
|
||||
|
|
|
@ -15,7 +15,7 @@ watchfiles==0.20.0 # https://github.com/samuelcolvin/watchfiles
|
|||
# ------------------------------------------------------------------------------
|
||||
mypy==1.4.1 # https://github.com/python/mypy
|
||||
django-stubs[compatible-mypy]==4.2.3 # https://github.com/typeddjango/django-stubs
|
||||
pytest==7.4.0 # https://github.com/pytest-dev/pytest
|
||||
pytest==7.4.1 # https://github.com/pytest-dev/pytest
|
||||
pytest-sugar==0.9.7 # https://github.com/Frozenball/pytest-sugar
|
||||
{%- if cookiecutter.use_drf == "y" %}
|
||||
djangorestframework-stubs[compatible-mypy]==3.14.2 # https://github.com/typeddjango/djangorestframework-stubs
|
||||
|
@ -38,7 +38,7 @@ 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
|
||||
{%- endif %}
|
||||
pre-commit==3.3.3 # https://github.com/pre-commit/pre-commit
|
||||
pre-commit==3.4.0 # https://github.com/pre-commit/pre-commit
|
||||
|
||||
# Django
|
||||
# ------------------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in New Issue
Block a user