Merge pull request #164 from mdellweg/cookiecutter

Update cookiecutter

Author: gerrod3

.ci/scripts/check_cli_dependencies.py

@@ -0,0 +1,37 @@
+#!/bin/env python3
+
+import tomllib
+from pathlib import Path
+
+from packaging.requirements import Requirement
+
+if __name__ == "__main__":
+    base_path = Path(__file__).parent.parent.parent
+    glue_path = "pulp-glue-deb"
+    with (base_path / "pyproject.toml").open("rb") as fp:
+        cli_pyproject = tomllib.load(fp)
+
+    cli_dependency = next(
+        (
+            Requirement(r)
+            for r in cli_pyproject["project"]["dependencies"]
+            if r.startswith("pulp-cli")
+        )
+    )
+
+    with (base_path / glue_path / "pyproject.toml").open("rb") as fp:
+        glue_pyproject = tomllib.load(fp)
+
+    glue_dependency = next(
+        (
+            Requirement(r)
+            for r in glue_pyproject["project"]["dependencies"]
+            if r.startswith("pulp-glue")
+        )
+    )
+
+    if cli_dependency.specifier != glue_dependency.specifier:
+        print("🪢 CLI and GLUE dependencies mismatch:")
+        print(" ", cli_dependency)
+        print(" ", glue_dependency)
+        exit(1)

.ci/scripts/check_click_for_mypy.py

@@ -1,11 +1,9 @@
 #!/bin/env python3
 
-import sys
-
 import click
 from packaging.version import parse
 
 if parse(click.__version__) < parse("8.1.1") or parse(click.__version__) >= parse("8.2"):
     print("🚧 Linting with mypy is currently only supported with click~=8.1.1. 🚧")
     print("🔧 Please run `pip install click~=8.1.1` first. 🔨")
-    sys.exit(1)
+    exit(1)

.github/workflows/cookiecutter.yml

@@ -0,0 +1,58 @@
+---
+name: "Update CI from cookiecutter"
+on:
+  workflow_dispatch:
+
+defaults:
+  run:
+    working-directory: "pulp-cli-deb"
+
+jobs:
+  update-ci:
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: "actions/checkout@v4"
+        with:
+          repository: "pulp/pulp-cli"
+          path: "pulp-cli"
+      - uses: "actions/checkout@v4"
+        with:
+          token: "${{ secrets.RELEASE_TOKEN }}"
+          path: "pulp-cli-deb"
+      - name: "Set up Python"
+        uses: "actions/setup-python@v5"
+        with:
+          python-version: "3.11"
+      - name: "Setup git"
+        run: |
+          git config user.name pulpbot
+          git config user.email [email protected]
+      - name: "Install python dependencies"
+        run: |
+          pip install cookiecutter tomlkit
+      - name: "Apply cookiecutter templates"
+        run: |
+          ../pulp-cli/cookiecutter/apply_templates.py
+          if [ "$(git status --porcelain)" ]
+          then
+            git add .
+            git commit -m "Update cookiecutter"
+          fi
+      - name: "Create Pull Request"
+        uses: "peter-evans/create-pull-request@v7"
+        id: "create_pr"
+        with:
+          token: "${{ secrets.RELEASE_TOKEN }}"
+          title: "Update cookiecutter"
+          body: ""
+          branch: "update_cookiecutter"
+          delete-branch: true
+          path: "pulp-cli-deb"
+      - name: "Mark PR automerge"
+        run: |
+          gh pr merge --rebase --auto "${{ steps.create_pr.outputs.pull-request-number }}"
+        if: "steps.create_pr.outputs.pull-request-number"
+        env:
+          GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
+        continue-on-error: true
+...

Makefile

@@ -26,6 +26,7 @@ lint:
 	cd pulp-glue-deb; isort -c --diff .
 	black --diff --check .
 	flake8
+	.ci/scripts/check_cli_dependencies.py
 	.ci/scripts/check_click_for_mypy.py
 	MYPYPATH=pulp-glue-deb mypy
 	cd pulp-glue-deb; mypy