feat: improved plain project

* fixed ci for plain project
* added tests for plain project
* simplified justfile
* removed unnecessary things from pyproject.toml in plain project
* removed .env.example for plain project
* added .python-version to skeleton

Author: pepe5p

.github/workflows/ci.yml

@@ -17,16 +17,14 @@ jobs:
       - name: "Install just"
         uses: extractions/setup-just@v3
 
-      - name: "Install uv"
-        uses: astral-sh/setup-uv@v5
-        with:
-          version: "0.7.19"
-
       - name: "Set up Python"
         uses: actions/setup-python@v5
         with:
           python-version-file: ".python-version"
 
+      - name: "Install uv"
+        uses: astral-sh/setup-uv@v5
+
       - name: "Install dependencies"
         run: uv sync --dev --no-cache-dir --locked
 
@@ -40,5 +38,7 @@ jobs:
         run: just test
 
       - name: "Run CI checks in generated code"
-        run: just _ci_generation_check
+        run: just generation_check
 
+      - name: "Run CI checks in generated code (docker variant)"
+        run: just generation_check_docker

justfile

@@ -1,7 +1,7 @@
-PROJECT_NAME := "copier-python-project"
 TEST_CATALOG := "test_catalog"
-COPIER_ANSWERS_CATALOG := ".copier"
-TEST_ANSWERS_FILE := COPIER_ANSWERS_CATALOG + "/.copier-answers." + PROJECT_NAME + ".yml"
+DEFAULT_OUTPUT := TEST_CATALOG + "/generated_project"
+DOCKER_OUTPUT := TEST_CATALOG + "/dockerized_project"
+PLAIN_OUTPUT := TEST_CATALOG + "/plain_project"
 PATHS_TO_LINT := "tests"
 
 [doc("Command run when 'just' is called without any arguments")]
@@ -13,7 +13,7 @@ help:
 
 [group("generation")]
 [doc("Generates repo from template to output directory")]
-copy output=TEST_CATALOG data_file="example-answers.yml":
+copy data_file output=DEFAULT_OUTPUT:
     uv run copier copy . {{ output }} \
     --vcs-ref=HEAD \
     --data-file {{ data_file }} \
@@ -22,44 +22,25 @@ copy output=TEST_CATALOG data_file="example-answers.yml":
     --force
 
 [group("generation")]
-[doc("Deletes the output directory, excluding the answers file (it is remained for re-copying).")]
-clear output=TEST_CATALOG:
-	find "{{ output }}" -mindepth 1 \
-	-not -path "{{ output }}/{{ COPIER_ANSWERS_CATALOG }}" \
-	-not -path "{{ output }}/{{ TEST_ANSWERS_FILE }}" \
-	-delete
-
-[group("generation")]
-[doc("Re-copies the template to the output directory, using the answers file. If clear is true, it deletes the output directory first.")]
-recopy output=TEST_CATALOG clear="true" skip-answered="true":
-	@if {{ clear }}; then \
-		just clear {{ output }}; \
-	fi
-	uv run copier recopy {{ output }} \
-	--vcs-ref=HEAD \
-	--answers-file {{ TEST_ANSWERS_FILE }} \
-	--overwrite \
-	{{ if skip-answered == "true" { "--skip-answered" } else { "" } }}
-
-[group("generation")]
-[doc("Same as `recopy`, but with `skip-answered=false` to allow modifying answers.")]
-update output=TEST_CATALOG clear="true":
-	just recopy output={{ output }} clear={{ clear }} skip-answered=false recopy
+[doc("Runs linters and tests in the output directory (docker variant).")]
+output_all_ff_docker output=DEFAULT_OUTPUT:
+	cp {{ output }}/.env.example {{ output }}/.env
+	cd {{ output }} && uv lock
+	just --justfile {{ output }}/justfile dc all_ff
 
 [group("generation")]
 [doc("Runs linters and tests in the output directory.")]
-run_lints_and_tests_in_output output=TEST_CATALOG:
-	cp {{ output }}/.env.example {{ output }}/.env
+output_all_ff output=DEFAULT_OUTPUT:
 	cd {{ output }} && uv lock
-	just --justfile {{ output }}/justfile dc all_ff
+	just --justfile {{ output }}/justfile all_ff
 
 [group("development")]
 [doc("Run all checks and tests (lints, mypy, tests...)")]
-all: lint_full test
+all: lint_full test generation_check generation_check_docker
 
 [group("development")]
 [doc("Run all checks and tests, but fail on first that returns error (lints, mypy, tests...)")]
-all_ff: lint_full_ff test
+all_ff: lint_full_ff test generation_check generation_check_docker
 
 [group("development")]
 [doc("Runs template tests.")]
@@ -102,6 +83,14 @@ lint_fix:
 	uv run ruff check {{PATHS_TO_LINT}} --fix
 	uv run ruff format {{PATHS_TO_LINT}}
 
-_ci_generation_check output=TEST_CATALOG:
-    just copy {{ output }}
-    just run_lints_and_tests_in_output {{ output }}
+[group("development")]
+[group("generation")]
+generation_check_docker data_file="test_answers/docker.yml" output=DOCKER_OUTPUT:
+    just copy {{ data_file }} {{ output }}
+    just output_all_ff_docker {{ output }}
+
+[group("development")]
+[group("generation")]
+generation_check  data_file="test_answers/plain.yml" output=PLAIN_OUTPUT:
+    just copy {{ data_file }} {{ output }}
+    just output_all_ff {{ output }}

skeleton/.github/workflows/ci.yml.jinja

@@ -27,6 +27,9 @@ jobs:
         with:
           python-version-file: ".python-version"
 
+      - name: "Install uv"
+        uses: astral-sh/setup-uv@v5
+
       - name: "Install dependencies"
         run: uv sync --dev --no-cache-dir --frozen
 

skeleton/.python-version

@@ -0,0 +1 @@
+3.13

skeleton/pyproject.toml.jinja

@@ -10,16 +10,22 @@ dependencies = []
 [dependency-groups]
 dev = [
     "copier>=9.8.0",
+    {%- if docker %}
     "dotenv-linter>=0.4.0,<0.5",
+    {%- endif %}
     "fawltydeps>=0.20.0,<1.0.0",
     "ipython>=8.14.0,<9",
     "mypy>=1.10.0,<2",
     "pytest-asyncio>=0.25.2,<0.26",
     "pytest-cov>=6.0.0,<7",
+    {%- if docker %}
     "pytest-env>=1.1.3,<2",
+    {%- endif %}
     "pytest-mock>=3.14.0,<4",
     "pytest>=8.3.4,<9",
+    {%- if docker %}
     "python-dotenv>=1.0.0,<2",
+    {%- endif %}
     "ruff>=0.14.1",
 ]
 
@@ -70,15 +76,21 @@ deps = ["pyproject.toml"]
 ignore_unused = [
     # Dev dependencies. This list should contain ALL of them!
     "copier",
+    {% if docker %}
     "dotenv-linter",
+    {% endif %}
     "fawltydeps",
     "ipython",
     "mypy",
     "pytest-asyncio",
     "pytest-cov",
+    {%- if docker %}
     "pytest-env",
+    {%- endif %}
     "pytest-mock",
+    {% if docker %}
     "python-dotenv",
+    {% endif %}
     "pytest",
     "ruff",
 ]
@@ -93,8 +105,10 @@ disable_error_code = "misc"
 python_files = ["tests.py", "test_*.py", "*_tests.py"]
 addopts = "--strict-markers -p no:warnings --cov=. --cov-fail-under=90 --cov-config=.coveragerc"
 asyncio_mode = "auto"
+{%- if docker %}
 
 [tool.pytest_env]
 FLAVOR = "test"
 DEBUG = "True"
 SERVICE_NAME = "{{ project_name_kebab_case }}"
+{%- endif %}

skeleton/.env.example.jinja …f docker %}.env.example{% endif %}.jinjaskeleton/.env.example.jinja renamed to skeleton/{% if docker %}.env.example{% endif %}.jinja skeleton/.env.example.jinja renamed to skeleton/{% if docker %}.env.example{% endif %}.jinja

@@ -0,0 +1,5 @@
+author_email: author@email.test
+author_name: test-author
+description: Service description.
+docker: false
+project_name: test-service