Merge branch 'master' into auto-generate-contributors

docs/linters.rst

@@ -19,7 +19,7 @@ The config for flake8 is located in setup.cfg. It specifies:
 pylint
 ------
 
-This is included in flake8's checks, but you can also run it separately to see a more detailed report: ::
+To run pylint: ::
 
     $ pylint <python files that you wish to lint>
 

requirements.txt

@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==19.10b0
-isort==5.4.0
+isort==5.4.1
 flake8==3.8.3
 flake8-isort==4.0.0
 

{{cookiecutter.project_slug}}/.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
       - id: black
 
   - repo: https://github.com/timothycrosley/isort
-    rev: 5.3.2
+    rev: 5.4.1
     hooks:
       - id: isort
 

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

@@ -20,7 +20,7 @@ pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==3.2.0  # https://github.com/sphinx-doc/sphinx
+sphinx==3.2.1  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality
@@ -37,7 +37,7 @@ pre-commit==2.6.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------
-factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
+factory-boy==3.0.1  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.0.5  # https://github.com/django-extensions/django-extensions

{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py

@@ -1,7 +1,8 @@
 from typing import Any, Sequence
 
 from django.contrib.auth import get_user_model
-from factory import DjangoModelFactory, Faker, post_generation
+from factory import Faker, post_generation
+from factory.django import DjangoModelFactory
 
 
 class UserFactory(DjangoModelFactory):