added vuln checking to created, add all option to created, added min python version

Author: btr1975

cookiecutter.json

@@ -6,21 +6,46 @@
     "git_url": "https://github.com/{{ cookiecutter.git_username }}/{{ cookiecutter.git_repo_name }}",
     "app_description": "A short description",
     "app_version": "0.1.0",
-    "app_documents_location": ["readthedocs.io", "github-pages"],
-    "app_documents_theme": ["sphinx_rtd_theme", "alabaster"],
+    "app_documents_location": [
+        "readthedocs.io",
+        "github-pages"
+    ],
+    "app_documents_theme": [
+        "sphinx_rtd_theme",
+        "alabaster"
+    ],
     "__app_name": "{{ cookiecutter.git_repo_name.lower().replace(' ', '_').replace('-', '_') }}",
-    "use_requests": ["n", "y"],
-    "use_cryptography": ["n", "y"],
-    "include_webpages": ["n", "y"],
-    "container_runtime": ["podman", "docker"],
+    "minimum_python_version": [
+        "3.9",
+        "3.10",
+        "3.11",
+        "3.12",
+        "3.13"
+    ],
+    "use_requests": [
+        "n",
+        "y"
+    ],
+    "use_cryptography": [
+        "n",
+        "y"
+    ],
+    "include_webpages": [
+        "n",
+        "y"
+    ],
+    "container_runtime": [
+        "podman",
+        "docker"
+    ],
     "__template_repo": "https://github.com/btr1975/cookiecutter-python-fastapi-openapi",
     "__template_version": "1.0.10",
-    "_new_lines":"\n",
+    "_new_lines": "\n",
     "_copy_without_render": [
         "{{cookiecutter.__app_name}}/templates",
         ".github"
     ],
-        "__prompts__": {
+    "__prompts__": {
         "full_name": "Your Full Name",
         "email": "Your E-Mail Address",
         "git_username": "Your GitHub Username or GitHub Organization Name",
@@ -38,6 +63,14 @@
             "sphinx_rtd_theme": "Read the Docs Theme",
             "alabaster": "Alabaster Theme"
         },
+        "minimum_python_version": {
+            "__prompt__": "Which minimum Python version will be supported",
+            "3.9": "3.9",
+            "3.10": "3.10",
+            "3.11": "3.11",
+            "3.12": "3.12",
+            "3.13": "3.13"
+        },
         "use_requests": {
             "__prompt__": "Will you use the requests library",
             "n": "No",

{{cookiecutter.git_repo_name}}/Makefile

@@ -1,15 +1,17 @@
 # Makefile for project needs
 # Author: Ben Trachtenberg
-# Version: 1.0.7
+# Version: 1.0.8
 #
 
-.PHONY: info build build-container coverage format pylint pytest gh-pages build dev-run start-container \
-	stop-container remove-container
+.PHONY: all info build build-container coverage format pylint pytest gh-pages build dev-run start-container \
+	stop-container remove-container check-vuln
 
 info:
 	@echo "make options"
+	@echo "    all                 To run coverage, format, pylint, and check-vuln"
 	@echo "    build               To build a distribution"
 	@echo "    build-container     To build a container image"
+	@echo "    check-vuln          To check for vulnerabilities in the dependencies"
 	@echo "    coverage            To run coverage and display ASCII and output to htmlcov"
 	@echo "    dev-run             To run the app"
 	@echo "    format              To format the code with black"
@@ -20,6 +22,8 @@ info:
 	@echo "    remove-container    To remove the container"
 {% if cookiecutter.app_documents_location == 'github-pages' %}	@echo "    gh-pages           To create the GitHub pages"{% endif %}
 
+all: coverage format pylint check-vuln
+
 build:
 	@python -m build
 
@@ -38,6 +42,7 @@ coverage:
 
 format:
 	@black {{cookiecutter.__app_name}}/
+	@black tests/
 
 pylint:
 	@pylint {{cookiecutter.__app_name}}/
@@ -76,3 +81,6 @@ stop-container:
 remove-container:
 	@docker rm {{ cookiecutter.git_repo_name }}
 {% endif %}
+
+check-vuln:
+	@pip-audit -r requirements.txt

{{cookiecutter.git_repo_name}}/make.bat

@@ -1,9 +1,18 @@
 @ECHO OFF
 REM Makefile for project needs
 REM Author: Ben Trachtenberg
-REM Version: 1.0.5
+REM Version: 1.0.6
 REM
 
+IF "%1" == "all" (
+    pytest --cov --cov-report=html -vvv
+    black {{cookiecutter.__app_name}}/
+    black tests/
+    pylint {{cookiecutter.__app_name}}\
+    pip-audit -r requirements.txt
+    GOTO END
+)
+
 IF "%1" == "build" (
     python -m build
     GOTO END
@@ -31,6 +40,12 @@ IF "%1" == "dev-run" (
 
 IF "%1" == "format" (
     black {{cookiecutter.__app_name}}/
+    black tests/
+    GOTO END
+)
+
+IF "%1" == "check-vuln" (
+    pip-audit -r requirements.txt
     GOTO END
 )
 
@@ -44,12 +59,14 @@ IF "%1" == "gh-pages" (
 {% endif %}
 
 @ECHO make options
-@ECHO     build     To build a distribution
-@ECHO     coverage  To run coverage and display ASCII and output to htmlcov
-@ECHO     dev-run   To run the app
-@ECHO     format    To format the code with black
-@ECHO     pylint    To run pylint
-@ECHO     pytest    To run pytest with verbose option
+@ECHO     all                 To run coverage, format, pylint, and check-vuln
+@ECHO     build               To build a distribution
+@ECHO     check-vuln          To check for vulnerabilities
+@ECHO     coverage            To run coverage and display ASCII and output to htmlcov
+@ECHO     dev-run             To run the app
+@ECHO     format              To format the code with black
+@ECHO     pylint              To run pylint
+@ECHO     pytest              To run pytest with verbose option
 {% if cookiecutter.app_documents_location == 'github-pages' %}@ECHO     gh-pages  To create the GitHub pages{% endif %}
 
 :END

{{cookiecutter.git_repo_name}}/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "{{ cookiecutter.git_repo_name }}"
 dynamic = ["version", "readme", "dependencies"]
-requires-python = ">=3.8"
+requires-python = ">={{ cookiecutter.minimum_python_version }}"
 description = "{{ cookiecutter.app_description }}"
 keywords = [
 ]
@@ -31,11 +31,22 @@ classifiers = [
     "Operating System :: Microsoft :: Windows",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
+    {% if cookiecutter.minimum_python_version == '3.9' %}"Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",{% endif -%}
+    {% if cookiecutter.minimum_python_version == '3.10' %}"Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",{% endif -%}
+    {% if cookiecutter.minimum_python_version == '3.11' %}"Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",{% endif -%}
+    {% if cookiecutter.minimum_python_version == '3.12' %}"Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",{% endif -%}
+    {% if cookiecutter.minimum_python_version == '3.13' %}"Programming Language :: Python :: 3.13",{% endif -%}
+
 ]
 
 [project.urls]
@@ -63,9 +74,6 @@ version = {attr = "{{cookiecutter.__app_name}}.version.__version__"}
 readme = {file = "README.md", content-type = "text/markdown"}
 dependencies = {file = "requirements.txt"}
 
-[tool.distutils.bdist_wheel]
-universal = true
-
 [tool.pytest.ini_options]
 addopts = "--strict-markers"
 markers = [

{{cookiecutter.git_repo_name}}/requirements-dev.txt

@@ -3,6 +3,7 @@
 #
 -r requirements.txt
 build
+pip-audit
 black
 tomli
 pytest-cov