From c1a874f7be605dcfe38d302b36744991a9bdd877 Mon Sep 17 00:00:00 2001
From: Samuel Schmidt <39338429+Sa-Schmi@users.noreply.github.com>
Date: Fri, 14 Jun 2024 10:26:05 +0200
Subject: [PATCH] removed sub module stuff
---
cookiecutter.json | 3 +--
hooks/pre_gen_project.py | 15 +++++++++++++++
.../__init__.py | 0
.../main.py | 0
4 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 hooks/pre_gen_project.py
rename {{cookiecutter.repo_name}}/src/{{{cookiecutter.project_name}}/{{cookiecutter.first_subpkg}} => {{cookiecutter.module_name}}}/__init__.py (100%)
rename {{cookiecutter.repo_name}}/src/{{{cookiecutter.project_name}}/{{cookiecutter.first_subpkg}} => {{cookiecutter.module_name}}}/main.py (100%)
diff --git a/cookiecutter.json b/cookiecutter.json
index 1e7eaab..99dd141 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -1,6 +1,5 @@
{
"repo_name": "repo_name",
- "project_name": "project_name",
"author_name": "Manu Musterperson",
- "first_subpkg": "sub_package"
+ "module_name": "module_name",
}
\ No newline at end of file
diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
new file mode 100644
index 0000000..5a9c812
--- /dev/null
+++ b/hooks/pre_gen_project.py
@@ -0,0 +1,15 @@
+import re
+import sys
+
+
+MODULE_REGEX = r"^[_a-zA-Z][_a-zA-Z0-9]+$"
+
+module_name = "{{ cookiecutter.module_name}}"
+
+if not re.match(MODULE_REGEX, module_name):
+ print(
+ "ERROR: The project slug (%s) is not a valid Python module name. "
+ "Please do not use a - and use _ instead" % module_name
+ )
+ # Exit to cancel project
+ sys.exit(1)
diff --git a/{{cookiecutter.repo_name}}/src/{{cookiecutter.project_name}}/{{cookiecutter.first_subpkg}}/__init__.py b/{{cookiecutter.repo_name}}/src/{{cookiecutter.module_name}}/__init__.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/src/{{cookiecutter.project_name}}/{{cookiecutter.first_subpkg}}/__init__.py
rename to {{cookiecutter.repo_name}}/src/{{cookiecutter.module_name}}/__init__.py
diff --git a/{{cookiecutter.repo_name}}/src/{{cookiecutter.project_name}}/{{cookiecutter.first_subpkg}}/main.py b/{{cookiecutter.repo_name}}/src/{{cookiecutter.module_name}}/main.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/src/{{cookiecutter.project_name}}/{{cookiecutter.first_subpkg}}/main.py
rename to {{cookiecutter.repo_name}}/src/{{cookiecutter.module_name}}/main.py
--
GitLab