Update cookiecutter

Author: mdellweg

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

@@ -1,7 +1,7 @@
 # /// script
 # requires-python = ">=3.11"
 # dependencies = [
-#     "gitpython>=3.1.46,<3.2.0",
+#     "pygithub>=2.8.1,<3.0.0",
 # ]
 # ///
 

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

@@ -9,23 +9,24 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - uses: "actions/checkout@v5"
-      {%- include "cache_action" %}
       - name: "Set up Python"
         uses: "actions/setup-python@v6"
         with:
           python-version: "3.14"
-      - name: "Install python dependencies"
-        run: |
-          pip install build setuptools wheel
+      - name: "Install uv"
+        uses: "astral-sh/setup-uv@v7"
+        with:
+          enable-cache: true
       - name: "Build wheels"
         run: |
           make build
+          touch .root
       - name: "Upload wheels"
         uses: "actions/upload-artifact@v4"
         with:
           name: "pulp_cli_packages"
           path: |
-            pulp-glue{{ cookiecutter.__app_label_suffix }}/dist/
+            .root
             dist/
           if-no-files-found: "error"
           retention-days: 5

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

@@ -15,19 +15,15 @@ jobs:
           - "3.14"
     steps:
       - uses: "actions/checkout@v5"
-      {%- include "cache_action" %}
-      - name: "Download wheels"
-        uses: "actions/download-artifact@v5"
-        with:
-          name: "pulp_cli_packages"
       - name: "Set up Python"
         uses: "actions/setup-python@v6"
         with:
           python-version: "{{ "${{ matrix.python }}" }}"
-      - name: "Install python 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 lint_requirements.txt
+      - name: "Install uv"
+        uses: "astral-sh/setup-uv@v7"
+        with:
+          enable-cache: true
       - name: "Lint code"
         run: |
-          make lint
+          make uv-lint
 ...

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

@@ -9,15 +9,15 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
-    uses: "./.github/workflows/build.yml"
   lint:
-    needs:
-      - "build"
     uses: "./.github/workflows/lint.yml"
-  test:
+  build:
     needs:
       - "lint"
+    uses: "./.github/workflows/build.yml"
+  test:
+    needs:
+      - "build"
     uses: "./.github/workflows/test.yml"
   {%- if cookiecutter.docs %}
   docs:
@@ -42,17 +42,18 @@ jobs:
         uses: "actions/setup-python@v6"
         with:
           python-version: "3.x"
-      - name: "Install python dependencies"
-        run: |
-          pip install toml pygithub
+      - name: "Install uv"
+        uses: "astral-sh/setup-uv@v7"
+        with:
+          enable-cache: true
       - name: "Check commit message"
         env:
           GITHUB_TOKEN: "{{ "${{ secrets.GITHUB_TOKEN }}" }}"
           GITHUB_CONTEXT: "{{ "${{ github.event.pull_request.commits_url }}" }}"
         run: |
           for SHA in $(curl -H "Authorization: token $GITHUB_TOKEN" "$GITHUB_CONTEXT" | jq -r '.[].sha')
           do
-            python .ci/scripts/validate_commit_message.py "$SHA"
+            uv run -q .ci/scripts/validate_commit_message.py "$SHA"
             VALUE=$?
             if [ "$VALUE" -gt 0 ]; then
               exit "$VALUE"

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

@@ -19,19 +19,24 @@ jobs:
     permissions:
       pull-requests: "write"
     steps:
-      - uses: "actions/checkout@v5"
+      - name: "Fetch Repository"
+        uses: "actions/checkout@v5"
         with:
           fetch-depth: 0
-      - uses: "actions/setup-python@v6"
+      - name: "Set up Python"
+        uses: "actions/setup-python@v6"
         with:
           python-version: "3.x"
+      - name: "Install uv"
+        uses: "astral-sh/setup-uv@v7"
+        with:
+          enable-cache: true
       - name: "Determine PR labels"
         run: |
-          pip install GitPython==3.1.42
           git fetch origin ${{ github.event.pull_request.head.sha }}
-          python .ci/scripts/pr_labels.py "origin/${{ github.base_ref }}" "${{ github.event.pull_request.head.sha }}" >> "$GITHUB_ENV"
-      - uses: "actions/github-script@v8"
-        name: "Apply PR Labels"
+          uv run -q .ci/scripts/pr_labels.py "origin/${{ github.base_ref }}" "${{ github.event.pull_request.head.sha }}" >> "$GITHUB_ENV"
+      - name: "Apply PR Labels"
+        uses: "actions/github-script@v8"
         with:
           script: |
             const { ADD_LABELS, REMOVE_LABELS } = process.env;

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

@@ -16,7 +16,6 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - uses: "actions/checkout@v5"
-      {%- include "cache_action" %}
       - name: "Download wheels"
         uses: "actions/download-artifact@v5"
         with:
@@ -25,12 +24,13 @@ jobs:
         uses: "actions/setup-python@v6"
         with:
           python-version: "3.14"
-      - 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: "Install uv"
+        uses: "astral-sh/setup-uv@v7"
+        with:
+          enable-cache: true
       - name: "Run tests"
         run: |
-          make unittest
+          uv run --isolated --with dist/pulp_glue*.whl --with dist/pulp_cli*.whl --only-group test make unittest
   {%- endif %}
   test:
     runs-on: "ubuntu-24.04"
@@ -43,7 +43,6 @@ jobs:
       matrix:{{ cookiecutter.test_matrix | jaml(level=4, embed_in="dict") }}
     steps:
       - uses: "actions/checkout@v5"
-      {%- include "cache_action" %}
       - name: "Download wheels"
         uses: "actions/download-artifact@v5"
         with:
@@ -60,18 +59,10 @@ jobs:
         run: |
           sudo apt-get install {{ cookiecutter.binary_dependencies }}
       {%- endif %}
-      - name: "Install Python Test Dependencies"
-        run: |
-          if [ "{{ "${{matrix.lower_bounds}}" }}" ]
-          then
-            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 -c lower_bounds_constraints.lock
-          elif [ "{{ "${{matrix.upper_bounds}}" }}" ]
-          then
-            .ci/scripts/calc_constraints.py pyproject.toml {%- if cookiecutter.glue %} pulp-glue{{ cookiecutter.__app_label_suffix }}/pyproject.toml {%- endif %}  --upper > upper_bounds_constraints.lock
-            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 -c upper_bounds_constraints.lock
-          else
-            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
-          fi
+      - name: "Install uv"
+        uses: "astral-sh/setup-uv@v7"
+        with:
+          enable-cache: true
       - name: "Run tests"
         env:
           {%- raw %}
@@ -87,5 +78,17 @@ jobs:
           OAS_VERSION: "${{ matrix.oas_version }}"
           {%- endraw %}
         run: |
-          .ci/run_container.sh make {% if cookiecutter.unittests %}live{% endif %}test
+          {%- raw %}
+          if [ "${{matrix.lower_bounds}}" ]
+          then
+            RESOLUTION=("--resolution" "lowest-direct")
+          elif [ "${{matrix.upper_bounds}}" ]
+          then
+            RESOLUTION=("--resolution" "highest")
+          else
+            RESOLUTION=()
+          fi
+
+          uv run "${RESOLUTION[@]}" --isolated --with dist/pulp_glue*.whl --with dist/pulp_cli*.whl --only-group test .ci/run_container.sh make livetest
+          {%- endraw %}
 ...

cookiecutter/ci/{{ cookiecutter.__project_name }}/.gitignore

@@ -1,8 +1,10 @@
 *.egg-info
 __pycache__/
 build/
-tests/cli.toml
-pytest_pulp_cli/GPG-PRIVATE-KEY-fixture-signing
 site/
 dist/
 *.po~
+
+tests/cli.toml
+GPG-PRIVATE-KEY-fixture-signing
+.root

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

@@ -2,9 +2,9 @@
 LANGUAGES=de
 {%- endif %}
 {%- if cookiecutter.glue %}
-GLUE_PLUGINS=$(notdir $(wildcard pulp-glue{{ cookiecutter.__app_label_suffix }}/pulp_glue/*))
+GLUE_PLUGINS=$(notdir $(wildcard pulp-glue{{ cookiecutter.__app_label_suffix }}/src/pulp_glue/*))
 {%- endif %}
-CLI_PLUGINS=$(notdir $(wildcard pulpcore/cli/*))
+CLI_PLUGINS=$(notdir $(wildcard src/pulpcore/cli/*))
 
 .PHONY: info
 info:
@@ -17,16 +17,18 @@ info:
 
 .PHONY: build
 build:
-{%- if cookiecutter.glue %}
-	cd pulp-glue{{ cookiecutter.__app_label_suffix }}; pyproject-build -n
-{%- endif %}
-	pyproject-build -n
+	uv build --all
 
 .PHONY: format
 format:
 	ruff format
 	ruff check --fix
 
+.PHONY: uv-format
+uv-format:
+	uv lock
+	uv run --isolated --group lint $(MAKE) format
+
 .PHONY: lint
 lint:
 	find tests .ci -name '*.sh' -print0 | xargs -0 shellcheck -x
@@ -36,14 +38,17 @@ lint:
 	.ci/scripts/check_cli_dependencies.py
 {%- endif %}
 	.ci/scripts/check_click_for_mypy.py
+	mypy
 {%- if cookiecutter.glue %}
-	MYPYPATH=pulp-glue{{ cookiecutter.__app_label_suffix }} mypy
 	cd pulp-glue{{ cookiecutter.__app_label_suffix }}; mypy
-{%- else %}
-	mypy
 {%- endif %}
 	@echo "🙊 Code 🙈 LGTM 🙉 !"
 
+.PHONY: uv-lint
+uv-lint:
+	uv lock --check
+	uv run --isolated --group lint $(MAKE) lint
+
 tests/cli.toml:
 	cp $@.example $@
 	@echo "In order to configure the tests to talk to your test server, you might need to edit $@ ."

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

@@ -4,7 +4,7 @@
 
 [tool.setuptools.packages.find]
 # This section is managed by the cookiecutter templates.
-where = ["."]
+where = ["src"]
 include = ["pulp_glue.*"]
 namespaces = true
 
@@ -22,10 +22,11 @@ extend-select = ["I"]
 
 [tool.mypy]
 # This section is managed by the cookiecutter templates.
+mypy_path = ["src"]
 strict = true
 warn_unused_ignores = false
 show_error_codes = true
-files = "pulp_glue/**/*.py, tests/**/*.py"
+files = "src/**/*.py, tests/**/*.py"
 namespace_packages = true
 explicit_package_bases = true