From 46557f5194a743204f8d03722176c3105cbbc9b9 Mon Sep 17 00:00:00 2001 From: Abdullah Adeel Date: Mon, 17 Jan 2022 14:12:36 +0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=84=20format=20with=20`pre-commit`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hooks/post_gen_project.py | 19 +++++++++---------- hooks/pre_gen_project.py | 19 +++++++++++-------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index f2f308d39..7e1374c2e 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -249,13 +249,12 @@ def generate_database_user(debug=False): def set_database_user(file_path: str, value: str, database_engine: str): database_user = set_flag( - file_path, - f"!!!SET {database_engine.upper()}_USER!!!", - value=value) + file_path, f"!!!SET {database_engine.upper()}_USER!!!", value=value + ) return database_user -def set_database_password(file_path: str, database_engine: str, value: str=None): +def set_database_password(file_path: str, database_engine: str, value: str = None): database_password = set_flag( file_path, f"!!!SET {database_engine.upper()}_USER!!!", @@ -327,23 +326,23 @@ def set_flags_in_envs(database_user, celery_flower_user, debug=False): set_database_user( get_database_env_path(env="local", database_engine=selected_database), value=database_user, - database_engine=selected_database - ) + database_engine=selected_database, + ) set_database_password( get_database_env_path(env="local", database_engine=selected_database), database_engine=selected_database, - value=DEBUG_VALUE if debug else None + value=DEBUG_VALUE if debug else None, ) set_database_user( get_database_env_path(env="prod", database_engine=selected_database), value=database_user, - database_engine=selected_database - ) + database_engine=selected_database, + ) set_database_password( get_database_env_path(env="prod", database_engine=selected_database), database_engine=selected_database, - value=DEBUG_VALUE if debug else None + value=DEBUG_VALUE if debug else None, ) set_celery_flower_user(local_django_envs_path, value=celery_flower_user) diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py index c0888eeb5..b07c736f0 100644 --- a/hooks/pre_gen_project.py +++ b/hooks/pre_gen_project.py @@ -17,8 +17,8 @@ INFO = "\x1b[1;33m [INFO]: " HINT = "\x1b[3;33m" SUCCESS = "\x1b[1;32m [SUCCESS]: " -SUPPORTED_POSTGRES_VERSIONS = [ "14.1", "13.5", "12.9", "11.14", "10.19"] -SUPPORTED_MYSQL_VERSIONS = [ "5.7" ] +SUPPORTED_POSTGRES_VERSIONS = ["14.1", "13.5", "12.9", "11.14", "10.19"] +SUPPORTED_MYSQL_VERSIONS = ["5.7"] project_slug = "{{ cookiecutter.project_slug }}" if hasattr(project_slug, "isidentifier"): @@ -88,12 +88,15 @@ if ( sys.exit(1) -if "{{ cookiecutter.database_version }}".lower().split("@")[0] != "{{ cookiecutter.database_engine }}": +if ( + "{{ cookiecutter.database_version }}".lower().split("@")[0] + != "{{ cookiecutter.database_engine }}" +): print( - WARNING - + " You have selected {{ cookiecutter.database_engine }} as your database engien and " - "your selected database_version {{ cookiecutter.database_version }} is not compatible with this " - "selection. Please retry and select appropriate option." - + TERMINATOR + WARNING + " You have selected {{ cookiecutter.database_engine }} " + "as your database engien and " + "your selected database_version {{ cookiecutter.database_version }} is not " + "compatible with this " + "selection. Please retry and select appropriate option." + TERMINATOR ) sys.exit(1)