diff --git a/hooks/post_gen_project.sh b/hooks/post_gen_project.sh index 3ea3494d..926215f4 100644 --- a/hooks/post_gen_project.sh +++ b/hooks/post_gen_project.sh @@ -22,7 +22,7 @@ echo Running initial migrations... cd ../ echo Apply formatting.. -make frmt +make fmt echo Running flake8.. make lint diff --git a/{{cookiecutter.project_slug}}/Makefile b/{{cookiecutter.project_slug}}/Makefile index 0fe5ff53..e7203ba4 100644 --- a/{{cookiecutter.project_slug}}/Makefile +++ b/{{cookiecutter.project_slug}}/Makefile @@ -10,7 +10,7 @@ deps: dev-deps: deps pip-compile --extra=dev --output-file=dev-requirements.txt pyproject.toml -frmt: +fmt: cd src && isort . cd src && black . diff --git a/{{cookiecutter.project_slug}}/dev-requirements.txt b/{{cookiecutter.project_slug}}/dev-requirements.txt index 84b27bd4..0ee56ed4 100644 --- a/{{cookiecutter.project_slug}}/dev-requirements.txt +++ b/{{cookiecutter.project_slug}}/dev-requirements.txt @@ -121,7 +121,6 @@ flake8==5.0.4 # via # flake8-absolute-import # flake8-bugbear - # flake8-commas # flake8-django # flake8-eradicate # flake8-isort @@ -143,8 +142,6 @@ flake8-bugbear==22.10.27 # via django (pyproject.toml) flake8-cognitive-complexity==0.1.0 # via django (pyproject.toml) -flake8-commas==2.1.0 - # via django (pyproject.toml) flake8-django==1.1.5 # via django (pyproject.toml) flake8-eradicate==1.4.0 diff --git a/{{cookiecutter.project_slug}}/pyproject.toml b/{{cookiecutter.project_slug}}/pyproject.toml index 2503bc65..092ab223 100644 --- a/{{cookiecutter.project_slug}}/pyproject.toml +++ b/{{cookiecutter.project_slug}}/pyproject.toml @@ -47,7 +47,6 @@ dev = [ "flake8-black", "flake8-bugbear", "flake8-cognitive-complexity", - "flake8-commas", "flake8-django", "flake8-eradicate", "flake8-isort>=4.0.0", @@ -87,7 +86,6 @@ ignore = [ "SIM102", # Use a single if-statement instead of nested if-statements "SIM113", # Use enumerate instead of manually incrementing a counter "E203", # whitespace before ':', disabled for black purposes https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#slices - "C812", # Missing trailing comma, disabled for black purposes https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#the-magic-trailing-comma ] exclude = [ "static", diff --git a/{{cookiecutter.project_slug}}/src/app/testing/runner.py b/{{cookiecutter.project_slug}}/src/app/testing/runner.py index 9b47b690..1de73672 100644 --- a/{{cookiecutter.project_slug}}/src/app/testing/runner.py +++ b/{{cookiecutter.project_slug}}/src/app/testing/runner.py @@ -7,4 +7,4 @@ def __init__(self, *args, **kwargs): pass def run_tests(self, *args): - raise CommandError("Please use command `pytest`.") + raise CommandError("Pytest here. Run it with `make test`")