From 63def67e8fa4bce31d29dafd8cbd48dd0e0043e3 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Mon, 14 Mar 2022 10:07:56 +0100 Subject: [PATCH 1/4] Fix pre-gen-hooks. --- hooks/pre_gen_project.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py index c0da4dc..2f1c199 100644 --- a/hooks/pre_gen_project.py +++ b/hooks/pre_gen_project.py @@ -20,8 +20,8 @@ and minus signs '-'. """ -EXCEPTION_MSG_PYTHONVERSION = """ -ERROR: The python version must be >= {PYTHONVERSION_MIN}, got {pythonversion}. +EXCEPTION_MSG_PYTHONVERSION = f""" +ERROR: The python version must be >= {PYTHONVERSION_MIN}, got {{python_version}}. """ @@ -30,18 +30,18 @@ def main() -> None: module_name = "{{ cookiecutter.project_slug}}" if not re.match(MODULE_REGEX, module_name): - raise ValueError(EXCEPTION_MSG_MODULE_NAME.format(module_name)) + raise ValueError(EXCEPTION_MSG_MODULE_NAME.format(module_name=module_name)) environment_name = "{{ cookiecutter.conda_environment_name }}" if not re.match(ENVIRON_REGEX, environment_name): - raise ValueError(EXCEPTION_MSG_ENVIRON_NAME.format(environment_name)) + raise ValueError(EXCEPTION_MSG_ENVIRON_NAME.format(environment_name=environment_name)) python_version = "{{ cookiecutter.python_version }}" if not re.match(PYTHONVERSION_REGEX, python_version): raise ValueError( - EXCEPTION_MSG_PYTHONVERSION.format(PYTHONVERSION_MIN, python_version) + EXCEPTION_MSG_PYTHONVERSION.format(python_version=python_version) ) From ed6ae8f9f6647cccd0990615a6da8eddd2a5d09f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 14 Mar 2022 09:08:16 +0000 Subject: [PATCH 2/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- hooks/pre_gen_project.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py index 2f1c199..b333a4d 100644 --- a/hooks/pre_gen_project.py +++ b/hooks/pre_gen_project.py @@ -35,7 +35,9 @@ def main() -> None: environment_name = "{{ cookiecutter.conda_environment_name }}" if not re.match(ENVIRON_REGEX, environment_name): - raise ValueError(EXCEPTION_MSG_ENVIRON_NAME.format(environment_name=environment_name)) + raise ValueError( + EXCEPTION_MSG_ENVIRON_NAME.format(environment_name=environment_name) + ) python_version = "{{ cookiecutter.python_version }}" From 05c0210b8ec063cc3d1c42912b45d3b942ec8c16 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Mon, 14 Mar 2022 10:12:12 +0100 Subject: [PATCH 3/4] Update pre_gen_project.py --- hooks/pre_gen_project.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py index b333a4d..9066faa 100644 --- a/hooks/pre_gen_project.py +++ b/hooks/pre_gen_project.py @@ -20,8 +20,8 @@ and minus signs '-'. """ -EXCEPTION_MSG_PYTHONVERSION = f""" -ERROR: The python version must be >= {PYTHONVERSION_MIN}, got {{python_version}}. +EXCEPTION_MSG_PYTHONVERSION = """ +ERROR: The python version must be >= {min_python_version}, got {python_version}. """ @@ -43,7 +43,8 @@ def main() -> None: if not re.match(PYTHONVERSION_REGEX, python_version): raise ValueError( - EXCEPTION_MSG_PYTHONVERSION.format(python_version=python_version) + EXCEPTION_MSG_PYTHONVERSION.format( + min_python_version=PYTHONVERSION_MIN, python_version=python_version) ) From d01f6a259a9206efe58a5db06e50ed96fac296a6 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 14 Mar 2022 09:12:24 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- hooks/pre_gen_project.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py index 9066faa..8f685d8 100644 --- a/hooks/pre_gen_project.py +++ b/hooks/pre_gen_project.py @@ -44,7 +44,8 @@ def main() -> None: if not re.match(PYTHONVERSION_REGEX, python_version): raise ValueError( EXCEPTION_MSG_PYTHONVERSION.format( - min_python_version=PYTHONVERSION_MIN, python_version=python_version) + min_python_version=PYTHONVERSION_MIN, python_version=python_version + ) )