| Krzysztof Szumny |
diff --git a/README.md b/README.md
index 7059e07d2..149227e03 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ production-ready Django projects quickly.
## Features
-- For Django 3.2
+- For Django 4.0
- Works with Python 3.9
- Renders Django projects with 100% starting test coverage
- Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5
diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 23bb7b9a8..77c8a5206 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -82,7 +82,7 @@ First things first.
or if you're running asynchronously: ::
- $ uvicorn config.asgi:application --host 0.0.0.0 --reload
+ $ uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html'
.. _PostgreSQL: https://www.postgresql.org/download/
.. _Redis: https://redis.io/download
diff --git a/docs/requirements.txt b/docs/requirements.txt
index dc8f4c6e9..c3b371b13 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinx==5.1.1
+sphinx==5.3.0
sphinx-rtd-theme==1.0.0
diff --git a/docs/settings.rst b/docs/settings.rst
index 7563f50d2..b8c6d448e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -46,6 +46,7 @@ DJANGO_AWS_SECRET_ACCESS_KEY AWS_SECRET_ACCESS_KEY n/a
DJANGO_AWS_STORAGE_BUCKET_NAME AWS_STORAGE_BUCKET_NAME n/a raises error
DJANGO_AWS_S3_REGION_NAME AWS_S3_REGION_NAME n/a None
DJANGO_AWS_S3_CUSTOM_DOMAIN AWS_S3_CUSTOM_DOMAIN n/a None
+DJANGO_AWS_S3_MAX_MEMORY_SIZE AWS_S3_MAX_MEMORY_SIZE n/a 100_000_000
DJANGO_GCP_STORAGE_BUCKET_NAME GS_BUCKET_NAME n/a raises error
GOOGLE_APPLICATION_CREDENTIALS n/a n/a raises error
SENTRY_DSN SENTRY_DSN n/a raises error
diff --git a/requirements.txt b/requirements.txt
index 4151bff95..b72480ba4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,15 +4,15 @@ binaryornot==0.4.4
# Code quality
# ------------------------------------------------------------------------------
-black==22.8.0
+black==22.10.0
isort==5.10.1
flake8==5.0.4
-flake8-isort==4.2.0
+flake8-isort==5.0.0
pre-commit==2.20.0
# Testing
# ------------------------------------------------------------------------------
-tox==3.25.1
+tox==3.26.0
pytest==7.1.3
pytest-cookies==0.6.1
pytest-instafail==0.4.2
@@ -20,7 +20,7 @@ pyyaml==6.0
# Scripting
# ------------------------------------------------------------------------------
-PyGithub==1.55
-gitpython==3.1.27
+PyGithub==1.56
+gitpython==3.1.29
jinja2==3.1.2
requests==2.28.1
diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index 262618531..5809f393d 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -108,7 +108,7 @@ def get_all_latest_django_versions(
current_minor_version = DjVersion.parse(current_version_str)
newer_versions: set[DjVersion] = set()
for django_version in get_django_versions():
- if _django_max_version >= django_version >= current_minor_version:
+ if current_minor_version < django_version <= _django_max_version:
newer_versions.add(django_version)
return current_minor_version, sorted(newer_versions, reverse=True)
diff --git a/setup.py b/setup.py
index 48068adfd..2b4640013 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
from distutils.core import setup
# We use calendar versioning
-version = "2022.09.15"
+version = "2022.10.19"
with open("README.rst") as readme_file:
long_description = readme_file.read()
@@ -27,7 +27,7 @@ setup(
classifiers=[
"Development Status :: 4 - Beta",
"Environment :: Console",
- "Framework :: Django :: 3.2",
+ "Framework :: Django :: 4.0",
"Intended Audience :: Developers",
"Natural Language :: English",
"License :: OSI Approved :: BSD License",
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index ec386b17e..1b68d8858 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -10,13 +10,13 @@ repos:
- id: check-yaml
- repo: https://github.com/asottile/pyupgrade
- rev: v2.37.3
+ rev: v3.1.0
hooks:
- id: pyupgrade
args: [--py39-plus]
- repo: https://github.com/psf/black
- rev: 22.8.0
+ rev: 22.10.0
hooks:
- id: black
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start
index 9cbb6c897..3fe547357 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/start
@@ -7,7 +7,7 @@ set -o nounset
python manage.py migrate
{%- if cookiecutter.use_async == 'y' %}
-uvicorn config.asgi:application --host 0.0.0.0 --reload
+uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html'
{%- else %}
python manage.py runserver_plus 0.0.0.0:8000
{%- endif %}
diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index 6f1bb8b5e..0ba192b10 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
COPY ./requirements /requirements
# create python dependency wheels
-RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels \
+RUN pip wheel --no-cache-dir --wheel-dir /usr/src/app/wheels \
-r /requirements/local.txt -r /requirements/production.txt \
&& rm -rf /requirements
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index b792e5448..8eed5a805 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -88,6 +88,11 @@ AWS_S3_OBJECT_PARAMETERS = {
"CacheControl": f"max-age={_AWS_EXPIRY}, s-maxage={_AWS_EXPIRY}, must-revalidate"
}
# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
+AWS_S3_MAX_MEMORY_SIZE = env.int(
+ "DJANGO_AWS_S3_MAX_MEMORY_SIZE",
+ default=100_000_000, # 100MB
+)
+# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
AWS_S3_REGION_NAME = env("DJANGO_AWS_S3_REGION_NAME", default=None)
# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#cloudfront
AWS_S3_CUSTOM_DOMAIN = env("DJANGO_AWS_S3_CUSTOM_DOMAIN", default=None)
@@ -167,7 +172,6 @@ EMAIL_BACKEND = "anymail.backends.mailjet.EmailBackend"
ANYMAIL = {
"MAILJET_API_KEY": env("MAILJET_API_KEY"),
"MAILJET_SECRET_KEY": env("MAILJET_SECRET_KEY"),
- "MAILJET_API_URL": env("MAILJET_API_URL", default="https://api.mailjet.com/v3"),
}
{%- elif cookiecutter.mail_service == 'Mandrill' %}
# https://anymail.readthedocs.io/en/stable/esps/mandrill/
@@ -190,8 +194,6 @@ ANYMAIL = {
EMAIL_BACKEND = "anymail.backends.sendgrid.EmailBackend"
ANYMAIL = {
"SENDGRID_API_KEY": env("SENDGRID_API_KEY"),
- "SENDGRID_GENERATE_MESSAGE_ID": env("SENDGRID_GENERATE_MESSAGE_ID"),
- "SENDGRID_MERGE_FIELD_FORMAT": env("SENDGRID_MERGE_FIELD_FORMAT"),
"SENDGRID_API_URL": env("SENDGRID_API_URL", default="https://api.sendgrid.com/v3/"),
}
{%- elif cookiecutter.mail_service == 'SendinBlue' %}
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index ab6f96ba4..1e7b4f7f9 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2022.2.1 # https://github.com/stub42/pytz
+pytz==2022.5 # https://github.com/stub42/pytz
python-slugify==6.1.2 # https://github.com/un33k/python-slugify
Pillow==9.2.0 # https://github.com/python-pillow/Pillow
{%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
@@ -18,7 +18,7 @@ hiredis==2.0.0 # https://github.com/redis/hiredis-py
{%- endif %}
{%- if cookiecutter.use_celery == "y" %}
celery==5.2.7 # pyup: < 6.0 # https://github.com/celery/celery
-django-celery-beat==2.3.0 # https://github.com/celery/django-celery-beat
+django-celery-beat==2.4.0 # https://github.com/celery/django-celery-beat
{%- if cookiecutter.use_docker == 'y' %}
flower==1.2.0 # https://github.com/mher/flower
{%- endif %}
@@ -29,7 +29,7 @@ uvicorn[standard]==0.18.3 # https://github.com/encode/uvicorn
# Django
# ------------------------------------------------------------------------------
-django==3.2.15 # pyup: < 4.0 # https://www.djangoproject.com/
+django==4.0.8 # pyup: < 4.1 # https://www.djangoproject.com/
django-environ==0.9.0 # https://github.com/joke2k/django-environ
django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils
django-allauth==0.51.0 # https://github.com/pennersr/django-allauth
@@ -41,10 +41,10 @@ django-compressor==4.1 # https://github.com/django-compressor/django-compressor
django-redis==5.2.0 # https://github.com/jazzband/django-redis
{%- if cookiecutter.use_drf == 'y' %}
# Django REST Framework
-djangorestframework==3.13.1 # https://github.com/encode/django-rest-framework
+djangorestframework==3.14.0 # https://github.com/encode/django-rest-framework
django-cors-headers==3.13.0 # https://github.com/adamchainz/django-cors-headers
# DRF-spectacular for api documentation
-drf-spectacular==0.24.0 # https://github.com/tfranzel/drf-spectacular
+drf-spectacular==0.24.2 # https://github.com/tfranzel/drf-spectacular
{%- endif %}
# Project
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 1d2d8fbf6..247a8e592 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -3,17 +3,17 @@
Werkzeug[watchdog]==2.2.2 # https://github.com/pallets/werkzeug
ipdb==0.13.9 # https://github.com/gotcha/ipdb
{%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.9.3 # https://github.com/psycopg/psycopg2
+psycopg2==2.9.4 # https://github.com/psycopg/psycopg2
{%- else %}
-psycopg2-binary==2.9.3 # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.9.4 # https://github.com/psycopg/psycopg2
{%- endif %}
{%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
-watchfiles==0.17.0 # https://github.com/samuelcolvin/watchfiles
+watchfiles==0.18.0 # https://github.com/samuelcolvin/watchfiles
{%- endif %}
# Testing
# ------------------------------------------------------------------------------
-mypy==0.971 # https://github.com/python/mypy
+mypy==0.982 # https://github.com/python/mypy
django-stubs==1.12.0 # https://github.com/typeddjango/django-stubs
pytest==7.1.3 # https://github.com/pytest-dev/pytest
pytest-sugar==0.9.5 # https://github.com/Frozenball/pytest-sugar
@@ -23,16 +23,16 @@ djangorestframework-stubs==1.7.0 # https://github.com/typeddjango/djangorestfra
# Documentation
# ------------------------------------------------------------------------------
-sphinx==5.1.1 # https://github.com/sphinx-doc/sphinx
+sphinx==5.3.0 # https://github.com/sphinx-doc/sphinx
sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
sphinx-rtd-theme==1.0.0 # https://pypi.org/project/sphinx-rtd-theme/
# Code quality
# ------------------------------------------------------------------------------
flake8==5.0.4 # https://github.com/PyCQA/flake8
-flake8-isort==4.2.0 # https://github.com/gforcada/flake8-isort
-coverage==6.4.4 # https://github.com/nedbat/coveragepy
-black==22.8.0 # https://github.com/psf/black
+flake8-isort==5.0.0 # https://github.com/gforcada/flake8-isort
+coverage==6.5.0 # https://github.com/nedbat/coveragepy
+black==22.10.0 # https://github.com/psf/black
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
@@ -43,7 +43,7 @@ pre-commit==2.20.0 # https://github.com/pre-commit/pre-commit
# ------------------------------------------------------------------------------
factory-boy==3.2.1 # https://github.com/FactoryBoy/factory_boy
-django-debug-toolbar==3.6.0 # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.2.0 # https://github.com/django-extensions/django-extensions
+django-debug-toolbar==3.7.0 # https://github.com/jazzband/django-debug-toolbar
+django-extensions==3.2.1 # https://github.com/django-extensions/django-extensions
django-coverage-plugin==2.0.3 # https://github.com/nedbat/django_coverage_plugin
pytest-django==4.5.2 # https://github.com/pytest-dev/pytest-django
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 371f81cbc..bfbf02023 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -3,12 +3,12 @@
-r base.txt
gunicorn==20.1.0 # https://github.com/benoitc/gunicorn
-psycopg2==2.9.3 # https://github.com/psycopg/psycopg2
+psycopg2==2.9.4 # https://github.com/psycopg/psycopg2
{%- if cookiecutter.use_whitenoise == 'n' %}
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
{%- endif %}
{%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.9.8 # https://github.com/getsentry/sentry-python
+sentry-sdk==1.9.10 # https://github.com/getsentry/sentry-python
{%- endif %}
{%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
hiredis==2.0.0 # https://github.com/redis/hiredis-py
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py
index 8bb2fa052..590a9ce53 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py
@@ -1,6 +1,6 @@
-# Generated by Django 3.2.13 on 2022-06-22 04:35
-
import {{ cookiecutter.project_slug }}.users.models
+import django.contrib.auth.models
+import django.contrib.auth.validators
from django.db import migrations, models
import django.utils.timezone
import uuid
|