Merge branch 'refs/heads/master' into dependabot/docker/{{cookiecutte…

…r.project_slug}}/compose/production/traefik/traefik-3.1.2
browniebroke · Aug 14, 2024 · 0850a28 · 0850a28
2 parents 19eb33f + a97d2b8
commit 0850a28
Show file tree

Hide file tree

Showing 11 changed files with 92 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,75 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2024.08.13
+
+
+### Updated
+
+- Update tox to 4.18.0 ([#5299](https://github.com/cookiecutter/cookiecutter-django/pull/5299))
+
+- Update sentry-sdk to 2.13.0 ([#5298](https://github.com/cookiecutter/cookiecutter-django/pull/5298))
+
+- Update uvicorn to 0.30.6 ([#5295](https://github.com/cookiecutter/cookiecutter-django/pull/5295))
+
+## 2024.08.12
+
+
+### Updated
+
+- Update gunicorn to 23.0.0 ([#5294](https://github.com/cookiecutter/cookiecutter-django/pull/5294))
+
+## 2024.08.09
+
+
+### Updated
+
+- Update Ruff pre-commit hook to v0.5.7 ([#5293](https://github.com/cookiecutter/cookiecutter-django/pull/5293))
+
+## 2024.08.08
+
+
+### Updated
+
+- Update ruff to 0.5.7 ([#5291](https://github.com/cookiecutter/cookiecutter-django/pull/5291))
+
+- Bump python from 3.12.4 to 3.12.5 in docs Docker image ([#5287](https://github.com/cookiecutter/cookiecutter-django/pull/5287))
+
+- Bump python from 3.12.4 to 3.12.5 in local Docker image ([#5289](https://github.com/cookiecutter/cookiecutter-django/pull/5289))
+
+- Bump python from 3.12.4 to 3.12.5 in production Docker image ([#5290](https://github.com/cookiecutter/cookiecutter-django/pull/5290))
+
+## 2024.08.07
+
+
+### Updated
+
+- Update tox to 4.17.1 ([#5285](https://github.com/cookiecutter/cookiecutter-django/pull/5285))
+
+- Update django-anymail to 11.1 ([#5286](https://github.com/cookiecutter/cookiecutter-django/pull/5286))
+
+## 2024.08.06
+
+
+### Updated
+
+- Update django to 5.0.8 ([#5281](https://github.com/cookiecutter/cookiecutter-django/pull/5281))
+
+## 2024.08.05
+
+
+### Documentation
+
+- Simplify documentation for https in local development ([#5252](https://github.com/cookiecutter/cookiecutter-django/pull/5252))
+
+- Add Medium story in the Articles section ([#5275](https://github.com/cookiecutter/cookiecutter-django/pull/5275))
+
+### Updated
+
+- Update coverage to 7.6.1 ([#5276](https://github.com/cookiecutter/cookiecutter-django/pull/5276))
+
+- Auto-update pre-commit hooks ([#5277](https://github.com/cookiecutter/cookiecutter-django/pull/5277))
+
 ## 2024.08.04
 
 

diff --git a/requirements.txt b/requirements.txt
@@ -4,19 +4,19 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-ruff==0.5.6
+ruff==0.5.7
 django-upgrade==1.20.0
 djlint==1.34.1
 pre-commit==3.8.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.16.0
+tox==4.18.0
 pytest==8.3.2
 pytest-xdist==3.6.1
 pytest-cookies==0.7.0
 pytest-instafail==0.5.0
-pyyaml==6.0.1
+pyyaml==6.0.2
 
 # Scripting
 # ------------------------------------------------------------------------------

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2024.08.04"
+version = "2024.08.13"
 
 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
@@ -35,7 +35,7 @@ repos:
 
   # Run the Ruff linter.
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.6
+    rev: v0.5.7
     hooks:
       # Linter
       - id: ruff

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -1,5 +1,5 @@
 # define an alias for the specific python version used in this file.
-FROM docker.io/python:3.12.4-slim-bookworm AS python
+FROM docker.io/python:3.12.5-slim-bookworm AS python
 
 # Python build stage
 FROM python AS python-build-stage

diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -1,5 +1,5 @@
 # define an alias for the specific python version used in this file.
-FROM docker.io/python:3.12.4-slim-bookworm AS python
+FROM docker.io/python:3.12.5-slim-bookworm AS python
 
 
 # Python build stage

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -25,7 +25,7 @@ RUN npm run build
 
 {%- endif %}
 # define an alias for the specific python version used in this file.
-FROM docker.io/python:3.12.4-slim-bookworm AS python
+FROM docker.io/python:3.12.5-slim-bookworm AS python
 
 # Python build stage
 FROM python AS python-build-stage

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -23,13 +23,13 @@ flower==2.0.1  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.30.5  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.30.6  # https://github.com/encode/uvicorn
 uvicorn-worker==0.2.0  # https://github.com/Kludex/uvicorn-worker
 {%- endif %}
 
 # Django
 # ------------------------------------------------------------------------------
-django==5.0.7  # pyup: < 5.1  # https://www.djangoproject.com/
+django==5.0.8  # 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]==64.0.0  # https://github.com/pennersr/django-allauth

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality
 # ------------------------------------------------------------------------------
-ruff==0.5.6  # https://github.com/astral-sh/ruff
+ruff==0.5.7  # https://github.com/astral-sh/ruff
 coverage==7.6.1  # https://github.com/nedbat/coveragepy
 djlint==1.34.1  # https://github.com/Riverside-Healthcare/djLint
 pre-commit==3.8.0  # https://github.com/pre-commit/pre-commit

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -2,13 +2,13 @@
 
 -r base.txt
 
-gunicorn==22.0.0  # https://github.com/benoitc/gunicorn
+gunicorn==23.0.0  # https://github.com/benoitc/gunicorn
 psycopg[c]==3.2.1  # https://github.com/psycopg/psycopg
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfasta==3.2.0  # https://github.com/jasongi/collectfasta
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==2.12.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==2.13.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==3.0.0  # 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.1  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==11.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon-ses]==11.0.1  # https://github.com/anymail/django-anymail
+django-anymail[amazon-ses]==11.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==11.0.1  # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==11.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==11.0.1  # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==11.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==11.0.1  # https://github.com/anymail/django-anymail
+django-anymail[postmark]==11.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==11.0.1  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==11.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Brevo' %}
-django-anymail[brevo]==11.0.1  # https://github.com/anymail/django-anymail
+django-anymail[brevo]==11.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==11.0.1  # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==11.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==11.0.1  # https://github.com/anymail/django-anymail
+django-anymail==11.1  # https://github.com/anymail/django-anymail
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.12.4
+python-3.12.5