From b8618430c96f552a97170d02626ca998d91036c3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 26 Aug 2020 10:05:23 -0700 Subject: [PATCH 1/3] Update black from 19.10b0 to 20.8b1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 270d2535..9661a823 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -black==19.10b0 +black==20.8b1 isort==5.4.2 flake8==3.8.3 flake8-isort==4.0.0 From 0dc3fe0b3d15faa394a6d2d2180c0fc976c0ac8c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 26 Aug 2020 10:05:24 -0700 Subject: [PATCH 2/3] Update black from 19.10b0 to 20.8b1 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 01538655..1b3b7fa0 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild flake8==3.8.3 # https://github.com/PyCQA/flake8 flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort coverage==5.2.1 # https://github.com/nedbat/coveragepy -black==19.10b0 # https://github.com/ambv/black +black==20.8b1 # https://github.com/ambv/black pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery From e21869c1d4268c786451f45171b56b69abaca41c Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 27 Aug 2020 09:41:28 +0200 Subject: [PATCH 3/3] Fix black formatting issues --- tests/test_cookiecutter_generation.py | 10 ++++++++-- .../{{cookiecutter.project_slug}}/users/models.py | 3 +-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 89b9b856..f9bfcd53 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -175,7 +175,10 @@ def test_black_passes(cookies, context_override): @pytest.mark.parametrize( ["use_docker", "expected_test_script"], - [("n", "pytest"), ("y", "docker-compose -f local.yml run django pytest"),], + [ + ("n", "pytest"), + ("y", "docker-compose -f local.yml run django pytest"), + ], ) def test_travis_invokes_pytest(cookies, context, use_docker, expected_test_script): context.update({"ci_tool": "Travis", "use_docker": use_docker}) @@ -197,7 +200,10 @@ def test_travis_invokes_pytest(cookies, context, use_docker, expected_test_scrip @pytest.mark.parametrize( ["use_docker", "expected_test_script"], - [("n", "pytest"), ("y", "docker-compose -f local.yml run django pytest"),], + [ + ("n", "pytest"), + ("y", "docker-compose -f local.yml run django pytest"), + ], ) def test_gitlab_invokes_flake8_and_pytest( cookies, context, use_docker, expected_test_script diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py index 70efdfde..8391bc03 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py @@ -5,8 +5,7 @@ from django.utils.translation import gettext_lazy as _ class User(AbstractUser): - """Default user for {{cookiecutter.project_name}}. - """ + """Default user for {{cookiecutter.project_name}}.""" #: First and last name do not cover name patterns around the globe name = CharField(_("Name of User"), blank=True, max_length=255)