| Yuchen Xie |
diff --git a/README.rst b/README.rst
index f964635f..dbc510a4 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,8 @@
Cookiecutter Django
-=======================
+===================
-.. image:: https://travis-ci.org/pydanny/cookiecutter-django.svg?branch=master
- :target: https://travis-ci.org/pydanny/cookiecutter-django?branch=master
+.. image:: https://img.shields.io/github/workflow/status/pydanny/cookiecutter-django/CI/master
+ :target: https://github.com/pydanny/cookiecutter-django/actions?query=workflow%3ACI
:alt: Build Status
.. image:: https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest
diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 0da26548..2b7806ce 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -34,10 +34,10 @@ First things first.
$ git init # A git repo is required for pre-commit to install
$ pre-commit install
- .. note::
+ .. note::
- the `pre-commit` exists in the generated project as default.
- for the details of `pre-commit`, follow the [site of pre-commit](https://pre-commit.com/).
+ the `pre-commit` exists in the generated project as default.
+ for the details of `pre-commit`, follow the [site of pre-commit](https://pre-commit.com/).
#. Create a new PostgreSQL database using createdb_: ::
diff --git a/docs/document.rst b/docs/document.rst
index 15a5396e..a3097909 100644
--- a/docs/document.rst
+++ b/docs/document.rst
@@ -15,15 +15,30 @@ If you set up your project to `develop locally with docker`_, run the following
Navigate to port 7000 on your host to see the documentation. This will be opened automatically at `localhost`_ for local, non-docker development.
+Note: using Docker for documentation sets up a temporary SQLite file by setting the environment variable ``DATABASE_URL=sqlite:///readthedocs.db`` in ``docs/conf.py`` to avoid a dependency on PostgreSQL.
+
Generate API documentation
----------------------------
-Edit the ``docs/_source`` files and project application docstrings to create your documentation.
+Edit the ``docs`` files and project application docstrings to create your documentation.
-Sphinx can automatically include class and function signatures and docstrings in generated documentation.
+Sphinx can automatically include class and function signatures and docstrings in generated documentation.
See the generated project documentation for more examples.
+Setting up ReadTheDocs
+----------------------
+
+To setup your documentation on `ReadTheDocs`_, you must
+
+1. Go to `ReadTheDocs`_ and login/create an account
+2. Add your GitHub repository
+3. Trigger a build
+
+Additionally, you can auto-build Pull Request previews, but `you must enable it`_.
+
.. _localhost: http://localhost:7000/
.. _Sphinx: https://www.sphinx-doc.org/en/master/index.html
.. _develop locally: ./developing-locally.html
.. _develop locally with docker: ./developing-locally-docker.html
+.. _ReadTheDocs: https://readthedocs.org/
+.. _you must enable it: https://docs.readthedocs.io/en/latest/guides/autobuild-docs-for-pull-requests.html#autobuild-documentation-for-pull-requests
diff --git a/requirements.txt b/requirements.txt
index 6c04acb9..87161a2e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,23 +1,23 @@
cookiecutter==1.7.2
-sh==1.14.0
+sh==1.14.1
binaryornot==0.4.4
# Code quality
# ------------------------------------------------------------------------------
black==20.8b1
-isort==5.6.4
+isort==5.7.0
flake8==3.8.4
flake8-isort==4.0.0
# Testing
# ------------------------------------------------------------------------------
-tox==3.20.1
-pytest==6.1.1
+tox==3.21.2
+pytest==5.4.3 # pyup: <6 # https://github.com/hackebrot/pytest-cookies/issues/51
pytest-cookies==0.5.1
pytest-instafail==0.4.2
-pyyaml==5.3.1
+pyyaml==5.4.1
# Scripting
# ------------------------------------------------------------------------------
-PyGithub==1.53
+PyGithub==1.54.1
jinja2==2.11.2
diff --git a/setup.py b/setup.py
index 8a5b0b8c..c72ba1c9 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ except ImportError:
# Our version ALWAYS matches the version of Django we support
# If Django has a new release, we branch, tag, then update this setting after the tag.
-version = "3.0.10"
+version = "3.0.11"
if sys.argv[-1] == "tag":
os.system(f'git tag -a {version} -m "version {version}"')
diff --git a/tests/test_bare.sh b/tests/test_bare.sh
index 61a66239..eae09dc7 100755
--- a/tests/test_bare.sh
+++ b/tests/test_bare.sh
@@ -6,9 +6,9 @@
set -o errexit
set -x
-# Install modern pip to use new resolver:
-# https://blog.python.org/2020/07/upgrade-pip-20-2-changes-20-3.html
-pip install 'pip>=20.2'
+# Install modern pip with new resolver:
+# https://blog.python.org/2020/11/pip-20-3-release-new-resolver.html
+pip install 'pip>=20.3'
# install test requirements
pip install -r requirements.txt
@@ -25,7 +25,7 @@ cd my_awesome_project
sudo utility/install_os_dependencies.sh install
# Install Python deps
-pip install --use-feature=2020-resolver -r requirements/local.txt
+pip install -r requirements/local.txt
# run the project's tests
pytest
diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 52818e18..57add2c0 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -58,7 +58,7 @@ jobs:
run: docker-compose -f local.yml exec -T django pytest
- name: Tear down the Stack
- run: docker-compose down
+ run: docker-compose -f local.yml down
{%- else %}
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 5dc5c1c4..5a5b58a6 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ fail_fast: true
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v3.2.0
+ rev: v3.4.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
@@ -16,7 +16,7 @@ repos:
- id: black
- repo: https://github.com/timothycrosley/isort
- rev: 5.6.4
+ rev: 5.7.0
hooks:
- id: isort
diff --git a/{{cookiecutter.project_slug}}/.readthedocs.yml b/{{cookiecutter.project_slug}}/.readthedocs.yml
new file mode 100644
index 00000000..b193a85e
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.readthedocs.yml
@@ -0,0 +1,9 @@
+version: 2
+
+sphinx:
+ configuration: docs/conf.py
+
+python:
+ version: 3.8
+ install:
+ - requirements: requirements/local.txt
diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml
index 24f9f24a..f478685e 100644
--- a/{{cookiecutter.project_slug}}/.travis.yml
+++ b/{{cookiecutter.project_slug}}/.travis.yml
@@ -1,4 +1,4 @@
-dist: xenial
+dist: focal
language: python
python:
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
index acd6f157..d7b63cd4 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
@@ -4,4 +4,4 @@ set -o errexit
set -o nounset
-celery -A config.celery_app worker -l INFO
+watchgod celery.__main__.main --args -A config.celery_app worker -l INFO
diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index 7736777b..315fdd40 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -24,6 +24,8 @@ COPY ./requirements /requirements
# All imports needed for autodoc.
RUN pip install -r /requirements/local.txt -r /requirements/production.txt
-WORKDIR /docs
+COPY ./compose/local/docs/start /start-docs
+RUN sed -i 's/\r$//g' /start-docs
+RUN chmod +x /start-docs
-CMD make livehtml
+WORKDIR /docs
diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/start b/{{cookiecutter.project_slug}}/compose/local/docs/start
new file mode 100644
index 00000000..fd2e0de6
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/start
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
+make livehtml
diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile
index 4f772cad..0b56e1f8 100644
--- a/{{cookiecutter.project_slug}}/docs/Makefile
+++ b/{{cookiecutter.project_slug}}/docs/Makefile
@@ -5,7 +5,7 @@
# from the environment for the first two.
SPHINXOPTS ?=
SPHINXBUILD ?= sphinx-build -c .
-SOURCEDIR = ./_source
+SOURCEDIR = .
BUILDDIR = ./_build
{%- if cookiecutter.use_docker == 'y' %}
APP = /app
diff --git a/{{cookiecutter.project_slug}}/docs/conf.py b/{{cookiecutter.project_slug}}/docs/conf.py
index 691f351e..c640e1c6 100644
--- a/{{cookiecutter.project_slug}}/docs/conf.py
+++ b/{{cookiecutter.project_slug}}/docs/conf.py
@@ -14,11 +14,19 @@ import os
import sys
import django
-{% if cookiecutter.use_docker == 'y' %}
-sys.path.insert(0, os.path.abspath("/app"))
-os.environ.setdefault("DATABASE_URL", "")
-{% else %}
-sys.path.insert(0, os.path.abspath(".."))
+if os.getenv("READTHEDOCS", default=False) == "True":
+ sys.path.insert(0, os.path.abspath(".."))
+ os.environ["DJANGO_READ_DOT_ENV_FILE"] = "True"
+ os.environ["USE_DOCKER"] = "no"
+else:
+{%- if cookiecutter.use_docker == 'y' %}
+ sys.path.insert(0, os.path.abspath("/app"))
+{%- else %}
+ sys.path.insert(0, os.path.abspath(".."))
+{%- endif %}
+os.environ["DATABASE_URL"] = "sqlite:///readthedocs.db"
+{%- if cookiecutter.use_celery == 'y' %}
+os.environ["CELERY_BROKER_URL"] = os.getenv("REDIS_URL", "redis://redis:6379")
{%- endif %}
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
django.setup()
diff --git a/{{cookiecutter.project_slug}}/docs/_source/howto.rst b/{{cookiecutter.project_slug}}/docs/howto.rst
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/howto.rst
rename to {{cookiecutter.project_slug}}/docs/howto.rst
diff --git a/{{cookiecutter.project_slug}}/docs/_source/index.rst b/{{cookiecutter.project_slug}}/docs/index.rst
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/index.rst
rename to {{cookiecutter.project_slug}}/docs/index.rst
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/configuration.rst b/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/configuration.rst
rename to {{cookiecutter.project_slug}}/docs/pycharm/configuration.rst
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/1.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/1.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/1.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/1.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/2.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/2.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/2.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/2.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/3.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/3.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/3.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/3.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/4.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/4.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/4.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/4.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/7.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/7.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/7.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/7.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/8.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/8.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/8.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/8.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f1.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/f1.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f1.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/f1.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f2.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/f2.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f2.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/f2.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f3.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/f3.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f3.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/f3.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f4.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/f4.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f4.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/f4.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue1.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/issue1.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue1.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/issue1.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue2.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/issue2.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue2.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/issue2.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/users.rst b/{{cookiecutter.project_slug}}/docs/users.rst
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/users.rst
rename to {{cookiecutter.project_slug}}/docs/users.rst
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index a6cbe543..e285f349 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -51,7 +51,8 @@ services:
- ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }}:z
ports:
- "7000:7000"
-
+ command: /start-docs
+
{%- if cookiecutter.use_mailhog == 'y' %}
mailhog:
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index e0045f41..475ac186 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
-pytz==2020.1 # https://github.com/stub42/pytz
+pytz==2020.5 # https://github.com/stub42/pytz
python-slugify==4.0.1 # https://github.com/un33k/python-slugify
-Pillow==8.0.0 # https://github.com/python-pillow/Pillow
+Pillow==8.1.0 # https://github.com/python-pillow/Pillow
{%- if cookiecutter.use_compressor == "y" %}
{%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}
rcssmin==1.0.6 --install-option="--without-c-extensions" # https://github.com/ndparker/rcssmin
@@ -18,29 +18,28 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py
{%- endif %}
{%- if cookiecutter.use_celery == "y" %}
celery==4.4.6 # pyup: < 5.0,!=4.4.7 # https://github.com/celery/celery
-django-celery-beat==2.0.0 # https://github.com/celery/django-celery-beat
+django-celery-beat==2.2.0 # https://github.com/celery/django-celery-beat
{%- if cookiecutter.use_docker == 'y' %}
-flower==0.9.5 # https://github.com/mher/flower
+flower==0.9.7 # https://github.com/mher/flower
{%- endif %}
{%- endif %}
{%- if cookiecutter.use_async == 'y' %}
-uvicorn==0.12.1 # https://github.com/encode/uvicorn
-wsproto==0.15.0 # https://github.com/python-hyper/wsproto/
+uvicorn[standard]==0.13.3 # https://github.com/encode/uvicorn
{%- endif %}
# Django
# ------------------------------------------------------------------------------
-django==3.0.10 # pyup: < 3.1 # https://www.djangoproject.com/
+django==3.0.11 # pyup: < 3.1 # https://www.djangoproject.com/
django-environ==0.4.5 # https://github.com/joke2k/django-environ
-django-model-utils==4.0.0 # https://github.com/jazzband/django-model-utils
-django-allauth==0.43.0 # https://github.com/pennersr/django-allauth
-django-crispy-forms==1.9.2 # https://github.com/django-crispy-forms/django-crispy-forms
+django-model-utils==4.1.1 # https://github.com/jazzband/django-model-utils
+django-allauth==0.44.0 # https://github.com/pennersr/django-allauth
+django-crispy-forms==1.10.0 # https://github.com/django-crispy-forms/django-crispy-forms
{%- if cookiecutter.use_compressor == "y" %}
django-compressor==2.4 # https://github.com/django-compressor/django-compressor
{%- endif %}
django-redis==4.12.1 # https://github.com/jazzband/django-redis
{%- if cookiecutter.use_drf == "y" %}
# Django REST Framework
-djangorestframework==3.12.1 # https://github.com/encode/django-rest-framework
-django-cors-headers==3.5.0 # https://github.com/adamchainz/django-cors-headers
+djangorestframework==3.12.2 # https://github.com/encode/django-rest-framework
+django-cors-headers==3.6.0 # https://github.com/adamchainz/django-cors-headers
{%- endif %}
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 5aaf740b..9e26f6f0 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -7,39 +7,39 @@ psycopg2==2.8.6 # https://github.com/psycopg/psycopg2
{%- else %}
psycopg2-binary==2.8.6 # https://github.com/psycopg/psycopg2
{%- endif %}
-{%- if cookiecutter.use_async == 'y' %}
+{%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
watchgod==0.6 # https://github.com/samuelcolvin/watchgod
{%- endif %}
# Testing
# ------------------------------------------------------------------------------
-mypy==0.782 # https://github.com/python/mypy
-django-stubs==1.6.0 # https://github.com/typeddjango/django-stubs
-pytest==6.1.1 # https://github.com/pytest-dev/pytest
+mypy==0.800 # https://github.com/python/mypy
+django-stubs==1.7.0 # https://github.com/typeddjango/django-stubs
+pytest==6.2.1 # https://github.com/pytest-dev/pytest
pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar
# Documentation
# ------------------------------------------------------------------------------
-sphinx==3.2.1 # https://github.com/sphinx-doc/sphinx
+sphinx==3.4.3 # https://github.com/sphinx-doc/sphinx
sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
# Code quality
# ------------------------------------------------------------------------------
flake8==3.8.4 # https://github.com/PyCQA/flake8
flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort
-coverage==5.3 # https://github.com/nedbat/coveragepy
+coverage==5.3.1 # https://github.com/nedbat/coveragepy
black==20.8b1 # https://github.com/ambv/black
-pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django
+pylint-django==2.4.2 # https://github.com/PyCQA/pylint-django
{%- if cookiecutter.use_celery == 'y' %}
pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery
{%- endif %}
-pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit
+pre-commit==2.9.3 # https://github.com/pre-commit/pre-commit
# Django
# ------------------------------------------------------------------------------
-factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy
+factory-boy==3.2.0 # https://github.com/FactoryBoy/factory_boy
-django-debug-toolbar==3.1.1 # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.0.9 # https://github.com/django-extensions/django-extensions
+django-debug-toolbar==3.2 # https://github.com/jazzband/django-debug-toolbar
+django-extensions==3.1.0 # https://github.com/django-extensions/django-extensions
django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin
-pytest-django==4.0.0 # https://github.com/pytest-dev/pytest-django
+pytest-django==4.1.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 58714e5c..4a610d0c 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6 # https://github.com/psycopg/psycopg2
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
{%- endif %}
{%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.19.1 # https://github.com/getsentry/sentry-python
+sentry-sdk==0.19.5 # https://github.com/getsentry/sentry-python
{%- endif %}
{%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
hiredis==1.1.0 # https://github.com/redis/hiredis-py
@@ -17,9 +17,9 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py
# Django
# ------------------------------------------------------------------------------
{%- if cookiecutter.cloud_provider == 'AWS' %}
-django-storages[boto3]==1.10.1 # https://github.com/jschneier/django-storages
+django-storages[boto3]==1.11.1 # https://github.com/jschneier/django-storages
{%- elif cookiecutter.cloud_provider == 'GCP' %}
-django-storages[google]==1.10.1 # https://github.com/jschneier/django-storages
+django-storages[google]==1.11.1 # https://github.com/jschneier/django-storages
{%- endif %}
{%- if cookiecutter.mail_service == 'Mailgun' %}
django-anymail[mailgun]==8.1 # https://github.com/anymail/django-anymail
diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt
index 43b47fb4..3e4835ce 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.8.5
+python-3.8.7
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 c9d89056..ef2c2d94 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
@@ -53,18 +53,6 @@ class Migration(migrations.Migration):
verbose_name="username",
),
),
- (
- "first_name",
- models.CharField(
- blank=True, max_length=30, verbose_name="first name"
- ),
- ),
- (
- "last_name",
- models.CharField(
- blank=True, max_length=150, verbose_name="last name"
- ),
- ),
(
"email",
models.EmailField(
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
index 8391bc03..935eee9a 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
@@ -9,6 +9,8 @@ class User(AbstractUser):
#: First and last name do not cover name patterns around the globe
name = CharField(_("Name of User"), blank=True, max_length=255)
+ first_name = None # type: ignore
+ last_name = None # type: ignore
def get_absolute_url(self):
"""Get url for user's detail view.
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
index 1a78f132..edd306cb 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
@@ -23,7 +23,7 @@ class UserFactory(DjangoModelFactory):
digits=True,
upper_case=True,
lower_case=True,
- ).generate(extra_kwargs={})
+ ).evaluate(None, None, extra={"locale": None})
)
self.set_password(password)
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index 3638c8f6..c2fe8b51 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -1,8 +1,12 @@
import pytest
+from django.contrib import messages
from django.contrib.auth.models import AnonymousUser
+from django.contrib.messages.middleware import MessageMiddleware
+from django.contrib.sessions.middleware import SessionMiddleware
from django.http.response import Http404
from django.test import RequestFactory
+from {{ cookiecutter.project_slug }}.users.forms import UserChangeForm
from {{ cookiecutter.project_slug }}.users.models import User
from {{ cookiecutter.project_slug }}.users.tests.factories import UserFactory
from {{ cookiecutter.project_slug }}.users.views import (
@@ -41,6 +45,25 @@ class TestUserUpdateView:
assert view.get_object() == user
+ def test_form_valid(self, user: User, rf: RequestFactory):
+ view = UserUpdateView()
+ request = rf.get("/fake-url/")
+
+ # Add the session/message middleware to the request
+ SessionMiddleware().process_request(request)
+ MessageMiddleware().process_request(request)
+ request.user = user
+
+ view.request = request
+
+ # Initialize the form
+ form = UserChangeForm()
+ form.cleaned_data = []
+ view.form_valid(form)
+
+ messages_sent = [m.message for m in messages.get_messages(request)]
+ assert messages_sent == ["Information successfully updated"]
+
class TestUserRedirectView:
def test_get_redirect_url(self, user: User, rf: RequestFactory):
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index 520b1e52..011ea410 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -27,11 +27,11 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
return reverse("users:detail", kwargs={"username": self.request.user.username})
def get_object(self):
- return User.objects.get(username=self.request.user.username)
+ return self.request.user
def form_valid(self, form):
messages.add_message(
- self.request, messages.INFO, _("Infos successfully updated")
+ self.request, messages.INFO, _("Information successfully updated")
)
return super().form_valid(form)
|