Update cookiecutter to use uv

Author: mdellweg

cookiecutter/apply_templates.py

@@ -4,22 +4,22 @@
 # dependencies = [
 #     "click>=8.3.1,<8.4",
 #     "cookiecutter>=2.6.0,<2.7",
+#     "jamldump>=1.2.0,<1.3.0",
 #     "pyyaml>=6.0.3,<6.1",
 #     "tomlkit>=0.13.3,<0.14",
 # ]
 # ///
 
 
 import os
-import tomllib
 from pathlib import Path
 
 import click
+import migrate_src_layout
+import tomllib
 import yaml
-
 from cookiecutter.main import cookiecutter
 
-import migrate_src_layout
 
 @click.option("--bootstrap/--no-bootstrap")
 @click.option("--force/--no-force")
@@ -47,6 +47,12 @@ def main(bootstrap: bool, force: bool) -> None:
     except (FileNotFoundError, KeyError):
         raise click.ClickException("This does not look like a pulp cli repository.")
 
+    if config.get("src_layout") is not True:
+        raise click.ClickException(
+            "In oder to proceed, this repository needs to be migrated to the src_layout. "
+            "See the adjacent `migrate_src_layout.py` script."
+        )
+
     config.setdefault("main_package", config["app_label"])
     config["current_version"] = pyproject_toml["project"]["version"]
 

cookiecutter/bootstrap/cookiecutter.json

@@ -15,5 +15,5 @@
   "repository": "https://github.com/pulp/{{ cookiecutter.__project_name }}",
   "_copy_without_render": [
   ],
-  "_extensions": [".pulp_filter_extension.PulpFilterExtension"]
+  "_extensions": ["jamldump.jinja2.Jaml", ".pulp_filter_extension.PulpFilterExtension"]
 }

cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulp-glue{{ cookiecutter.__app_label_suffix }}/pyproject.toml

@@ -28,5 +28,3 @@ dependencies = [
 [project.urls]
 repository = "https://github.com/pulp/{{ cookiecutter.__project_name }}"
 changelog = "https://github.com/pulp/{{ cookiecutter.__project_name }}/blob/main/CHANGES.md"
-
-[tool.mypy]

cookiecutter/ci/cookiecutter.json

@@ -15,11 +15,7 @@
   "repository": "https://github.com/pulp/{{ cookiecutter.__project_name }}",
   "_copy_without_render": [
     "CHANGES/.TEMPLATE.md",
-    ".github/workflows/collect_changes.yml",
-    ".github/workflows/release.yml",
-    ".github/workflows/release_branch.yml",
-    ".github/workflows/pr_checks.yml",
     ".ci/nginx.conf.j2"
   ],
-  "_extensions": [".pulp_filter_extension.PulpFilterExtension"]
+  "_extensions": ["jamldump.jinja2.Jaml", ".pulp_filter_extension.PulpFilterExtension"]
 }

cookiecutter/ci/hooks/post_gen_project.py

@@ -19,6 +19,12 @@
     # Is merging on the tool level appropriate?
     pyproject_toml["tool"].update(pyproject_toml_update["tool"])
 
+    if "dependency-groups" in pyproject_toml_update:
+        if "dependency-groups" not in pyproject_toml:
+            pyproject_toml["dependency-groups"]=pyproject_toml_update["dependency-groups"]
+        else:
+            pyproject_toml["dependency-groups"].update(pyproject_toml_update["dependency-groups"])
+
     # Remove legacy tools.
     for tool in ["flake8", "black", "isort"]:
         pyproject_toml["tool"].pop(tool, None)
@@ -32,6 +38,9 @@
     "pyproject.toml.update",
     ".bumpversion.cfg",
     ".flake8",
+    "test_requirements.txt",
+    "lint_requirements.txt",
+    ".ci/scripts/calc_constraints.py",
     {%- if not cookiecutter.glue %}
     "pulp-glue{{ cookiecutter.__app_label_suffix }}",
     "CHANGES/pulp-glue{{ cookiecutter.__app_label_suffix }}",

cookiecutter/ci/templates/cache_action

@@ -36,3 +36,10 @@ concurrency:
   with:
     enable-cache: true
 {%- endmacro -%}
+
+{%- macro setup_git() -%}
+- name: "Setup git"
+  run: |
+    git config user.name pulpbot
+    git config user.email pulp-infra@redhat.com
+{%- endmacro -%}

cookiecutter/ci/templates/macros

@@ -1,6 +1,6 @@
 #!/bin/env python3
 # /// script
-# requires-python = ">=3.11"
+# requires-python = ">=3.13"
 # dependencies = [
 #     "gitpython>=3.1.46,<3.2.0",
 #     "packaging>=25.0,<25.1",

cookiecutter/ci/{{ cookiecutter.__project_name }}/.ci/scripts/calc_constraints.py

@@ -40,15 +40,15 @@
 repo = g.get_repo("pulp/pulp-cli{{ cookiecutter.__app_label_suffix }}")
 
 
-def check_status(issue):
+def check_status(issue: str) -> None:
     gi = repo.get_issue(int(issue))
     if gi.pull_request:
         sys.exit(f"Error: issue #{issue} is a pull request.")
     if gi.closed_at:
         sys.exit(f"Error: issue #{issue} is closed.")
 
 
-def check_changelog(issue):
+def check_changelog(issue: str) -> None:
     matches = list(Path("CHANGES").rglob(f"{issue}.*"))
 
     if len(matches) < 1: