diff --git a/CHANGELOG.md b/CHANGELOG.md index 67ba9da93..843244210 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,87 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.18 + + +### Updated + +- Update sphinx to 7.4.6 ([#5223](https://github.com/cookiecutter/cookiecutter-django/pull/5223)) + +## 2024.07.17 + + +### Updated + +- Update sphinx to 7.4.5 ([#5222](https://github.com/cookiecutter/cookiecutter-django/pull/5222)) + +## 2024.07.16 + + +### Fixed + +- Clear `ENTRYPOINT` in `awscli` image to allow script execution ([#5221](https://github.com/cookiecutter/cookiecutter-django/pull/5221)) + +### Updated + +- Update sphinx to 7.4.4 ([#5218](https://github.com/cookiecutter/cookiecutter-django/pull/5218)) + +## 2024.07.15 + + +### Updated + +- Update sentry-sdk to 2.10.0 ([#5216](https://github.com/cookiecutter/cookiecutter-django/pull/5216)) + +- Update sphinx to 7.4.2 ([#5215](https://github.com/cookiecutter/cookiecutter-django/pull/5215)) + +- Update ruff to 0.5.2 ([#5211](https://github.com/cookiecutter/cookiecutter-django/pull/5211)) + +- Update sphinx to 7.4.0 ([#5214](https://github.com/cookiecutter/cookiecutter-django/pull/5214)) + +## 2024.07.12 + + +### Updated + +- Update django-allauth to 0.63.6 ([#5210](https://github.com/cookiecutter/cookiecutter-django/pull/5210)) + +- Update django-allauth to 0.63.5 ([#5206](https://github.com/cookiecutter/cookiecutter-django/pull/5206)) + +- Update coverage to 7.6.0 ([#5207](https://github.com/cookiecutter/cookiecutter-django/pull/5207)) + +- Update django-anymail to 11.0.1 ([#5208](https://github.com/cookiecutter/cookiecutter-django/pull/5208)) + +## 2024.07.10 + + +### Updated + +- Update django-allauth to 0.63.4 ([#5204](https://github.com/cookiecutter/cookiecutter-django/pull/5204)) + +- Update django to 4.2.14 ([#5200](https://github.com/cookiecutter/cookiecutter-django/pull/5200)) + +- Update collectfasta to 3.2.0 ([#5201](https://github.com/cookiecutter/cookiecutter-django/pull/5201)) + +- Update sentry-sdk to 2.9.0 ([#5202](https://github.com/cookiecutter/cookiecutter-django/pull/5202)) + +- Update django-debug-toolbar to 4.4.6 ([#5203](https://github.com/cookiecutter/cookiecutter-django/pull/5203)) + +## 2024.07.09 + + +### Changed + +- Migrate from Collectfast to Collestfasta ([#5172](https://github.com/cookiecutter/cookiecutter-django/pull/5172)) + +### Documentation + +- Fix a typo in the `--all` option of the `makemessages` command ([#5198](https://github.com/cookiecutter/cookiecutter-django/pull/5198)) + +### Updated + +- Update django-storages to 1.14.4 ([#5197](https://github.com/cookiecutter/cookiecutter-django/pull/5197)) + ## 2024.07.08 diff --git a/docs/requirements.txt b/docs/requirements.txt index 26cb8da1b..e1bc625ff 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ -sphinx==7.3.7 +sphinx==7.4.6 sphinx-rtd-theme==2.0.0 myst-parser==3.0.1 diff --git a/requirements.txt b/requirements.txt index eebfd96a1..f0e7f7b9b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.1 +ruff==0.5.3 django-upgrade==1.19.0 djlint==1.34.1 pre-commit==3.7.1 diff --git a/setup.py b/setup.py index 1120abc64..43c986a1d 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.08" +version = "2024.07.18" with open("README.md") as readme_file: long_description = readme_file.read() diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 3ce3f0661..bc6ffe158 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.1 + rev: v0.5.3 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile index 22cfdf29f..9c7b8a69a 100644 --- a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile @@ -1,5 +1,8 @@ FROM docker.io/amazon/aws-cli:2.17.0 +# Clear entrypoint from the base image, otherwise it's always calling the aws CLI +ENTRYPOINT [] + COPY ./compose/production/aws/maintenance /usr/local/bin/maintenance COPY ./compose/production/postgres/maintenance/_sourced /usr/local/bin/maintenance/_sourced diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index c63adad01..c178da9ca 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,10 +29,10 @@ uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker # Django # ------------------------------------------------------------------------------ -django==5.0.6 # pyup: < 5.1 # https://www.djangoproject.com/ +django==5.0.7 # pyup: < 5.1 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils -django-allauth[mfa]==0.63.3 # https://github.com/pennersr/django-allauth +django-allauth[mfa]==0.63.6 # https://github.com/pennersr/django-allauth django-crispy-forms==2.2 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index e7270d8ad..4fb93fb4b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,13 +23,13 @@ djangorestframework-stubs[compatible-mypy]==3.15.0 # https://github.com/typeddj # Documentation # ------------------------------------------------------------------------------ -sphinx==7.3.7 # https://github.com/sphinx-doc/sphinx +sphinx==7.4.6 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.1 # https://github.com/astral-sh/ruff -coverage==7.5.4 # https://github.com/nedbat/coveragepy +ruff==0.5.3 # https://github.com/astral-sh/ruff +coverage==7.6.0 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit @@ -37,7 +37,7 @@ pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit # ------------------------------------------------------------------------------ factory-boy==3.3.0 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==4.4.5 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==4.4.6 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.2.3 # https://github.com/django-extensions/django-extensions django-coverage-plugin==3.1.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.8.0 # https://github.com/pytest-dev/pytest-django diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index afe39311c..5fa14841c 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -5,10 +5,10 @@ gunicorn==22.0.0 # https://github.com/benoitc/gunicorn psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg {%- if cookiecutter.use_whitenoise == 'n' %} -Collectfasta==3.1.3 # https://github.com/jasongi/collectfasta +Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.8.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.10.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.3.2 # https://github.com/redis/hiredis-py @@ -24,21 +24,21 @@ django-storages[google]==1.14.4 # https://github.com/jschneier/django-storages django-storages[azure]==1.14.4 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} -django-anymail[mailgun]==11.0 # https://github.com/anymail/django-anymail +django-anymail[mailgun]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} -django-anymail[amazon-ses]==11.0 # https://github.com/anymail/django-anymail +django-anymail[amazon-ses]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} -django-anymail[mailjet]==11.0 # https://github.com/anymail/django-anymail +django-anymail[mailjet]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} -django-anymail[mandrill]==11.0 # https://github.com/anymail/django-anymail +django-anymail[mandrill]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} -django-anymail[postmark]==11.0 # https://github.com/anymail/django-anymail +django-anymail[postmark]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} -django-anymail[sendgrid]==11.0 # https://github.com/anymail/django-anymail +django-anymail[sendgrid]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Brevo' %} -django-anymail[brevo]==11.0 # https://github.com/anymail/django-anymail +django-anymail[brevo]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} -django-anymail[sparkpost]==11.0 # https://github.com/anymail/django-anymail +django-anymail[sparkpost]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} -django-anymail==11.0 # https://github.com/anymail/django-anymail +django-anymail==11.0.1 # https://github.com/anymail/django-anymail {%- endif %}