[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

hooks/post_gen_project.py

@@ -98,10 +98,7 @@ def remove_utility_files():
 def remove_heroku_files():
     file_names = ["Procfile", "runtime.txt", "requirements.txt"]
     for file_name in file_names:
-        if (
+        if file_name == "requirements.txt" and "{{ cookiecutter.ci_tool }}".lower() == "travis":
-            file_name == "requirements.txt"
-            and "{{ cookiecutter.ci_tool }}".lower() == "travis"
-        ):
             # don't remove the file if we are using travisci but not using heroku
             continue
         os.remove(file_name)
@@ -201,9 +198,7 @@ def handle_js_runner(choice, use_docker, use_async):
         ]
         if not use_docker:
             dev_django_cmd = (
-                "uvicorn config.asgi:application --reload"
+                "uvicorn config.asgi:application --reload" if use_async else "python manage.py runserver_plus"
-                if use_async
-                else "python manage.py runserver_plus"
             )
             scripts.update(
                 {
@@ -240,9 +235,7 @@ def remove_celery_files():
     file_names = [
         os.path.join("config", "celery_app.py"),
         os.path.join("{{ cookiecutter.project_slug }}", "users", "tasks.py"),
-        os.path.join(
+        os.path.join("{{ cookiecutter.project_slug }}", "users", "tests", "test_tasks.py"),
-            "{{ cookiecutter.project_slug }}", "users", "tests", "test_tasks.py"
-        ),
     ]
     for file_name in file_names:
         os.remove(file_name)
@@ -273,9 +266,7 @@ def remove_dotdrone_file():
     os.remove(".drone.yml")
 
 
-def generate_random_string(
+def generate_random_string(length, using_digits=False, using_ascii_letters=False, using_punctuation=False):
-    length, using_digits=False, using_ascii_letters=False, using_punctuation=False
-):
     """
     Example:
         opting out for 50 symbol-long, [a-z][A-Z][0-9] string
@@ -369,9 +360,7 @@ def set_postgres_password(file_path, value=None):
 
 
 def set_celery_flower_user(file_path, value):
-    celery_flower_user = set_flag(
+    celery_flower_user = set_flag(file_path, "!!!SET CELERY_FLOWER_USER!!!", value=value)
-        file_path, "!!!SET CELERY_FLOWER_USER!!!", value=value
-    )
     return celery_flower_user
 
 
@@ -403,22 +392,14 @@ def set_flags_in_envs(postgres_user, celery_flower_user, debug=False):
     set_django_admin_url(production_django_envs_path)
 
     set_postgres_user(local_postgres_envs_path, value=postgres_user)
-    set_postgres_password(
+    set_postgres_password(local_postgres_envs_path, value=DEBUG_VALUE if debug else None)
-        local_postgres_envs_path, value=DEBUG_VALUE if debug else None
-    )
     set_postgres_user(production_postgres_envs_path, value=postgres_user)
-    set_postgres_password(
+    set_postgres_password(production_postgres_envs_path, value=DEBUG_VALUE if debug else None)
-        production_postgres_envs_path, value=DEBUG_VALUE if debug else None
-    )
 
     set_celery_flower_user(local_django_envs_path, value=celery_flower_user)
-    set_celery_flower_password(
+    set_celery_flower_password(local_django_envs_path, value=DEBUG_VALUE if debug else None)
-        local_django_envs_path, value=DEBUG_VALUE if debug else None
-    )
     set_celery_flower_user(production_django_envs_path, value=celery_flower_user)
-    set_celery_flower_password(
+    set_celery_flower_password(production_django_envs_path, value=DEBUG_VALUE if debug else None)
-        production_django_envs_path, value=DEBUG_VALUE if debug else None
-    )
 
 
 def set_flags_in_settings_files():
@@ -448,21 +429,9 @@ def remove_aws_dockerfile():
 def remove_drf_starter_files():
     os.remove(os.path.join("config", "api_router.py"))
     shutil.rmtree(os.path.join("{{cookiecutter.project_slug}}", "users", "api"))
-    os.remove(
+    os.remove(os.path.join("{{cookiecutter.project_slug}}", "users", "tests", "test_drf_urls.py"))
-        os.path.join(
+    os.remove(os.path.join("{{cookiecutter.project_slug}}", "users", "tests", "test_drf_views.py"))
-            "{{cookiecutter.project_slug}}", "users", "tests", "test_drf_urls.py"
+    os.remove(os.path.join("{{cookiecutter.project_slug}}", "users", "tests", "test_swagger.py"))
-        )
-    )
-    os.remove(
-        os.path.join(
-            "{{cookiecutter.project_slug}}", "users", "tests", "test_drf_views.py"
-        )
-    )
-    os.remove(
-        os.path.join(
-            "{{cookiecutter.project_slug}}", "users", "tests", "test_swagger.py"
-        )
-    )
 
 
 def main():
@@ -491,19 +460,13 @@ def main():
     else:
         remove_docker_files()
 
-    if (
+    if "{{ cookiecutter.use_docker }}".lower() == "y" and "{{ cookiecutter.cloud_provider}}" != "AWS":
-        "{{ cookiecutter.use_docker }}".lower() == "y"
-        and "{{ cookiecutter.cloud_provider}}" != "AWS"
-    ):
         remove_aws_dockerfile()
 
     if "{{ cookiecutter.use_heroku }}".lower() == "n":
         remove_heroku_files()
 
-    if (
+    if "{{ cookiecutter.use_docker }}".lower() == "n" and "{{ cookiecutter.use_heroku }}".lower() == "n":
-        "{{ cookiecutter.use_docker }}".lower() == "n"
-        and "{{ cookiecutter.use_heroku }}".lower() == "n"
-    ):
         if "{{ cookiecutter.keep_local_envs_in_vcs }}".lower() == "y":
             print(
                 INFO + ".env(s) are only utilized when Docker Compose and/or "
@@ -532,10 +495,7 @@ def main():
             use_async=("{{ cookiecutter.use_async }}".lower() == "y"),
         )
 
-    if (
+    if "{{ cookiecutter.cloud_provider }}" == "None" and "{{ cookiecutter.use_docker }}".lower() == "n":
-        "{{ cookiecutter.cloud_provider }}" == "None"
-        and "{{ cookiecutter.use_docker }}".lower() == "n"
-    ):
         print(
             WARNING + "You chose to not use any cloud providers nor Docker, "
             "media files won't be served in production." + TERMINATOR

tests/test_cookiecutter_generation.py

@@ -148,11 +148,7 @@ def _fixture_id(ctx):
 
 def build_files_list(base_dir):
     """Build a list containing absolute paths to the generated files."""
-    return [
+    return [os.path.join(dirpath, file_path) for dirpath, subdirs, files in os.walk(base_dir) for file_path in files]
-        os.path.join(dirpath, file_path)
-        for dirpath, subdirs, files in os.walk(base_dir)
-        for file_path in files
-    ]
 
 
 def check_paths(paths):
@@ -229,9 +225,7 @@ def test_django_upgrade_passes(cookies, context_override):
 
     python_files = [
         file_path.removeprefix(f"{result.project_path}/")
-        for file_path in glob.glob(
+        for file_path in glob.glob(str(result.project_path / "**" / "*.py"), recursive=True)
-            str(result.project_path / "**" / "*.py"), recursive=True
-        )
     ]
     try:
         sh.django_upgrade(
@@ -308,9 +302,7 @@ def test_travis_invokes_pytest(cookies, context, use_docker, expected_test_scrip
         ("y", "docker compose -f docker-compose.local.yml run django pytest"),
     ],
 )
-def test_gitlab_invokes_precommit_and_pytest(
+def test_gitlab_invokes_precommit_and_pytest(cookies, context, use_docker, expected_test_script):
-    cookies, context, use_docker, expected_test_script
-):
     context.update({"ci_tool": "Gitlab", "use_docker": use_docker})
     result = cookies.bake(extra_context=context)
 
@@ -337,9 +329,7 @@ def test_gitlab_invokes_precommit_and_pytest(
         ("y", "docker compose -f docker-compose.local.yml run django pytest"),
     ],
 )
-def test_github_invokes_linter_and_pytest(
+def test_github_invokes_linter_and_pytest(cookies, context, use_docker, expected_test_script):
-    cookies, context, use_docker, expected_test_script
-):
     context.update({"ci_tool": "Github", "use_docker": use_docker})
     result = cookies.bake(extra_context=context)