Update cookiecutter templates

Author: mdellweg

cookiecutter/apply_templates.py

@@ -15,7 +15,7 @@
 @click.option("--bootstrap/--no-bootstrap")
 @click.option("--force/--no-force")
 @click.command()
-def main(bootstrap: bool, force: bool):
+def main(bootstrap: bool, force: bool) -> None:
     cutter_path = Path(__file__).parent
 
     if bootstrap:

cookiecutter/ci/cookiecutter.json

@@ -7,6 +7,7 @@
   "binary_dependencies": "",
   "current_version": "0.0.1.dev",
   "test_matrix": null,
+  "unittests": false,
   "__app_label_suffix": "{{ cookiecutter.app_label and '-' + cookiecutter.app_label }}",
   "__project_name": "pulp-cli{{ cookiecutter.__app_label_suffix }}",
   "repository": "https://github.com/pulp/{{ cookiecutter.__project_name }}",

cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/test.yml

@@ -11,8 +11,33 @@ env:
   CONTAINER_RUNTIME: "docker"
 
 jobs:
+  {%- if cookiecutter.unittests %}
+  unittest:
+    runs-on: "ubuntu-20.04"
+    steps:
+      - uses: "actions/checkout@v4"
+      {%- include "cache_action" %}
+      - name: "Download wheels"
+        uses: "actions/download-artifact@v4"
+        with:
+          name: "pulp_cli_packages"
+      - name: "Set up Python"
+        uses: "actions/setup-python@v5"
+        with:
+          python-version: "3.12"
+      - name: "Install Python Test Dependencies"
+        run: |
+          pip install dist/pulp_cli{{ cookiecutter.__app_label_suffix | replace("-", "_") }}-*.whl {%- if cookiecutter.glue %} pulp-glue{{ cookiecutter.__app_label_suffix }}/dist/pulp_glue{{ cookiecutter.__app_label_suffix | replace("-", "_") }}-*.whl {%- endif %} -r test_requirements.txt
+      - name: "Run tests"
+        run: |
+          make unittest
+  {%- endif %}
   test:
     runs-on: "ubuntu-20.04"
+    {%- if cookiecutter.unittests %}
+    needs:
+      - "unittest"
+    {%- endif %}
     strategy:
       fail-fast: false
       matrix:{{ cookiecutter.test_matrix | jaml(level=4, embed_in="dict") }}
@@ -26,7 +51,9 @@ jobs:
       - name: "Set up Python"
         uses: "actions/setup-python@v5"
         with:
-          python-version: "{{ "${{ matrix.python }}" }}"
+          {%- raw %}
+          python-version: "${{ matrix.python }}"
+          {%- endraw %}
           allow-prereleases: true
       {%- if cookiecutter.binary_dependencies %}
       - name: "Install Binary Test Dependencies"
@@ -57,5 +84,5 @@ jobs:
           PULP_API_ROOT: "${{ matrix.pulp_api_root }}"
           {%- endraw %}
         run: |
-          .ci/run_container.sh make test
+          .ci/run_container.sh make {% if cookiecutter.unittests %}live{% endif %}test
 ...

cookiecutter/ci/{{ cookiecutter.__project_name }}/Makefile

@@ -20,7 +20,9 @@ build:
 {%- endif %}
 	pyproject-build -n
 
-black:
+black: format
+
+format:
 	isort .
 {%- if cookiecutter.glue %}
 	cd pulp-glue{{ cookiecutter.__app_label_suffix }}; isort .
@@ -51,6 +53,18 @@ tests/cli.toml:
 test: | tests/cli.toml
 	python3 -m pytest -v tests {%- if cookiecutter.glue %} pulp-glue{{ cookiecutter.__app_label_suffix }}/tests {%- endif %}
 	{%- if cookiecutter.__app_label_suffix == "" %} cookiecutter/pulp_filter_extension.py {%- endif %}
+
+livetest: | tests/cli.toml
+	python3 -m pytest -v tests {%- if cookiecutter.glue %} pulp-glue{{ cookiecutter.__app_label_suffix }}/tests {%- endif %} -m live
+
+unittest:
+	python3 -m pytest -v tests {%- if cookiecutter.glue %} pulp-glue{{ cookiecutter.__app_label_suffix }}/tests {%- endif %}
+	{%- if cookiecutter.__app_label_suffix == "" %} cookiecutter/pulp_filter_extension.py {%- endif %} -m "not live"
+{%- if cookiecutter.glue %}
+
+unittest_glue:
+	python3 -m pytest -v pulp-glue{{ cookiecutter.__app_label_suffix }}/tests -m "not live"
+{%- endif %}
 {%- if cookiecutter.docs %}
 
 docs:

cookiecutter/ci/{{ cookiecutter.__project_name }}/lint_requirements.txt

@@ -3,7 +3,7 @@ black==24.10.0
 flake8==7.1.1
 flake8-pyproject==1.2.3
 isort==5.13.2
-mypy==1.11.2
+mypy==1.13.0
 shellcheck-py==0.10.0.1
 
 # Type annotation stubs

cookiecutter/ci/{{ cookiecutter.__project_name }}/pyproject.toml.update

@@ -22,6 +22,7 @@ docs = {{ cookiecutter.docs | toml_value }}
 translations = {{ cookiecutter.translations | toml_value }}
 main_package = {{ cookiecutter.main_package | toml_value }}
 binary_dependencies = {{ cookiecutter.binary_dependencies | toml_value }}
+unittests = {{ cookiecutter.unittests | toml_value }}
 
 [tool.bumpversion]
 # This section is managed by the cookiecutter templates.

pyproject.toml

@@ -77,6 +77,7 @@ docs = true
 translations = true
 main_package = "common"
 binary_dependencies = ""
+unittests = true
 
 [tool.bumpversion]
 # This section is managed by the cookiecutter templates.