Merge branch 'master' into django-30

.github/FUNDING.yml

@@ -1,7 +1,7 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: danielroygreenfeld
+github: pydanny
+patreon: roygreenfeld
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel

CONTRIBUTORS.rst

@@ -49,6 +49,7 @@ Listed in alphabetical order.
   Adam Dobrawy             `@ad-m`_
   Adam Steele              `@adammsteele`_
   Agam Dua
+  Agustín Scaramuzza       `@scaramagus`_               @scaramagus
   Alberto Sanchez          `@alb3rto`_
   Alex Tsai                `@caffodian`_
   Alvaro [Andor]           `@andor-pierdelacabeza`_
@@ -118,6 +119,7 @@ Listed in alphabetical order.
   Garry Cairns             `@garry-cairns`_
   Garry Polley             `@garrypolley`_
   Gilbishkosma             `@Gilbishkosma`_
+  Guilherme Guy            `@guilherme1guy`_
   Hamish Durkin            `@durkode`_
   Hana Quadara             `@hanaquadara`_
   Harry Moreno             `@morenoh149`_                @morenoh149
@@ -275,6 +277,7 @@ Listed in alphabetical order.
 .. _@dhepper: https://github.com/dhepper
 .. _@dot2dotseurat: https://github.com/dot2dotseurat
 .. _@dsclementsen: https://github.com/dsclementsen
+.. _@guilherme1guy: https://github.com/guilherme1guy
 .. _@durkode: https://github.com/durkode
 .. _@Egregors: https://github.com/Egregors
 .. _@epileptic-fish: https://gihub.com/epileptic-fish
@@ -350,6 +353,7 @@ Listed in alphabetical order.
 .. _@rolep: https://github.com/rolep
 .. _@romanosipenko: https://github.com/romanosipenko
 .. _@saschalalala: https://github.com/saschalalala
+.. _@scaramagus: https://github.com/scaramagus
 .. _@shireenrao: https://github.com/shireenrao
 .. _@show0k: https://github.com/show0k
 .. _@shultz: https://github.com/shultz

requirements.txt

@@ -11,7 +11,7 @@ flake8-isort==2.8.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.14.5
-pytest==5.3.5
+pytest==5.4.1
 pytest-cookies==0.5.1
 pytest-instafail==0.4.1.post0
 pyyaml==5.3

{{cookiecutter.project_slug}}/.gitlab-ci.yml

@@ -6,6 +6,7 @@ variables:
   POSTGRES_USER: '{{ cookiecutter.project_slug }}'
   POSTGRES_PASSWORD: ''
   POSTGRES_DB: 'test_{{ cookiecutter.project_slug }}'
+  POSTGRES_HOST_AUTH_METHOD: trust
 
 flake8:
   stage: lint

{{cookiecutter.project_slug}}/compose/local/django/Dockerfile

@@ -1,6 +1,7 @@
 FROM python:3.7-slim-buster
 
 ENV PYTHONUNBUFFERED 1
+ENV PYTHONDONTWRITEBYTECODE 1
 
 RUN apt-get update \
   # dependencies for building Python packages

{{cookiecutter.project_slug}}/config/settings/base.py

@@ -75,10 +75,13 @@ THIRD_PARTY_APPS = [
     "allauth",
     "allauth.account",
     "allauth.socialaccount",
-    "rest_framework",
 {%- if cookiecutter.use_celery == 'y' %}
     "django_celery_beat",
 {%- endif %}
+{%- if cookiecutter.use_drf == "y" %}
+    "rest_framework",
+    "rest_framework.authtoken",
+{%- endif %}
 ]
 
 LOCAL_APPS = [

{{cookiecutter.project_slug}}/requirements/base.txt

@@ -28,6 +28,7 @@ django-crispy-forms==1.9.0  # https://github.com/django-crispy-forms/django-cris
 django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 {%- endif %}
 django-redis==4.11.0  # https://github.com/niwinz/django-redis
-
+{%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
 djangorestframework==3.11.0  # https://github.com/encode/django-rest-framework
+{%- endif %}

{{cookiecutter.project_slug}}/requirements/local.txt

@@ -2,7 +2,7 @@
 
 Werkzeug==1.0.0 # https://github.com/pallets/werkzeug
 ipdb==0.13.2  # https://github.com/gotcha/ipdb
-Sphinx==2.4.3  # https://github.com/sphinx-doc/sphinx
+Sphinx==2.4.4  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
@@ -11,8 +11,8 @@ psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.761  # https://github.com/python/mypy
-django-stubs==1.4.0  # https://github.com/typeddjango/django-stubs
+mypy==0.770  # https://github.com/python/mypy
+django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
 pytest==5.3.5  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
@@ -26,7 +26,7 @@ pylint-django==2.0.14  # 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.1.1  # https://github.com/pre-commit/pre-commit
+pre-commit==2.2.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------