Skip to content

Note that Makefile is cookiecutter-managed #1456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
gerrod3 wants to merge 2 commits into
base: main
Choose a base branch
from
+4 −1
Draft

Note that Makefile is cookiecutter-managed #1456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b1ecf0
Update cookiecutter makefile for paralleltest new PYTEST_MARK
gerrod3 Aug 12, 2026
2ad8e6e
Note that Makefile is cookiecutter-managed.
gerrod3 Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# This file is managed by cookiecutter. Any changes should originate in the template and be applied through cookiecutter/apply_templates.py.

LANGUAGES=de
GLUE_PLUGINS=$(notdir $(wildcard pulp-glue/src/pulp_glue/*))
Expand Down
4 changes: 3 additions & 1 deletion cookiecutter/ci/{{ cookiecutter.__project_name }}/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{%- set src_infix = "src/" if cookiecutter.src_layout else "" %}
# This file is managed by cookiecutter. Any changes should originate in the template and be applied through cookiecutter/apply_templates.py.

@mdellweg mdellweg Aug 13, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have a lot of this in the pyproject.toml, because it's rather unintuitive there.
# This section is managed by the cookiecutter templates.

I would keep the language similar:

Suggested change
# This file is managed by cookiecutter. Any changes should originate in the template and be applied through cookiecutter/apply_templates.py.
# This file is managed by the cookiecutter templates.

or

Suggested change
# This file is managed by cookiecutter. Any changes should originate in the template and be applied through cookiecutter/apply_templates.py.
# This file is managed by the cookiecutter templates.
# Do not edit manually.

Should we make that a macro and add to more files?
The whole .ci directory for example should be managed, but at the moment we don't delete additional files there.
The .github/workflows/test.yaml is extra-special. It is templated but keeps the test matrix intact.


{%- if cookiecutter.translations %}
LANGUAGES=de
{%- endif %}
Expand Down Expand Up @@ -80,7 +82,7 @@ livetest:

.PHONY: _paralleltest
_paralleltest: | tests/cli.toml
pytest -v tests {%- if cookiecutter.glue %} pulp-glue{{ cookiecutter.__app_label_suffix }}/tests {%- endif %} -m live -n 8
pytest -v tests {%- if cookiecutter.glue %} pulp-glue{{ cookiecutter.__app_label_suffix }}/tests {%- endif %} -m "$(PYTEST_MARK)" -n 8

.PHONY: paralleltest
paralleltest:
Expand Down
Loading