Update cookiecutter to use uv

Author: mdellweg

cookiecutter/apply_templates.py

@@ -4,19 +4,19 @@
 # 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 tomllib
 import yaml
-
 from cookiecutter.main import cookiecutter
 
 
@@ -43,6 +43,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,24 +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.setuptools.packages.find]
-where = ["."]
-include = ["pulp_glue.*"]
-namespaces = true
-
-[tool.setuptools.package-data]
-"*" = ["py.typed", "locale/*/LC_MESSAGES/*.mo"]
-
-[tool.mypy]
-strict = true
-show_error_codes = true
-files = "pulp_glue/**/*.py"
-namespace_packages = true
-explicit_package_bases = true
-
-[[tool.mypy.overrides]]
-module = [
-  "schema.*",
-]
-ignore_missing_imports = true

…ue/{{ cookiecutter.app_label }}/py.typed …{{ cookiecutter.app_label }}/__init__.pycookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulp-glue{{ cookiecutter.__app_label_suffix }}/pulp_glue/{{ cookiecutter.app_label }}/py.typed renamed to cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulp-glue{{ cookiecutter.__app_label_suffix }}/src/pulp_glue/{{ cookiecutter.app_label }}/__init__.py cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulp-glue{{ cookiecutter.__app_label_suffix }}/pulp_glue/{{ cookiecutter.app_label }}/py.typed renamed to cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulp-glue{{ cookiecutter.__app_label_suffix }}/src/pulp_glue/{{ cookiecutter.app_label }}/__init__.py

@@ -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.app_label }}/context.py …/{{ cookiecutter.app_label }}/context.pycookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulp-glue{{ cookiecutter.__app_label_suffix }}/pulp_glue/{{ cookiecutter.app_label }}/context.py renamed to cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulp-glue{{ cookiecutter.__app_label_suffix }}/src/pulp_glue/{{ cookiecutter.app_label }}/context.py cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulp-glue{{ cookiecutter.__app_label_suffix }}/pulp_glue/{{ cookiecutter.app_label }}/context.py renamed to cookiecutter/bootstrap/{{ cookiecutter.__project_name }}/pulp-glue{{ cookiecutter.__app_label_suffix }}/src/pulp_glue/{{ cookiecutter.app_label }}/context.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)