From 7dae82e5a784e545dc58fa17f0ecad1559db4452 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Sun, 19 Oct 2025 14:35:07 +0000 Subject: [PATCH] Update cookiecutter --- .github/dependabot.yml | 25 ------------- .github/workflows/build.yml | 4 +-- .github/workflows/collect_changes.yml | 4 +-- .github/workflows/cookiecutter.yml | 51 +++++++++++++++++++++++++-- .github/workflows/lint.yml | 4 +-- .github/workflows/pr.yml | 4 +-- .github/workflows/pr_checks.yml | 6 ++-- .github/workflows/publish.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/release_branch.yml | 6 ++-- .github/workflows/test.yml | 2 +- lint_requirements.txt | 6 ++-- 12 files changed, 69 insertions(+), 47 deletions(-) delete mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 7c64e30..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -version: 2 -updates: -- package-ecosystem: "pip" - directory: "/" - schedule: - interval: "daily" - commit-message: - prefix: "[PIP] " - open-pull-requests-limit: 10 -- package-ecosystem: "pip" - directory: "/pulp-glue-ostree" - schedule: - interval: "daily" - commit-message: - prefix: "[PIP] " - open-pull-requests-limit: 10 -- package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - commit-message: - prefix: "[GHA] " - open-pull-requests-limit: 10 -... diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d29c485..f6373ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,9 +17,9 @@ jobs: ${{ runner.os }}-pip- - name: "Set up Python" - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: - python-version: "3.11" + python-version: "3.14" - name: "Install python dependencies" run: | pip install build setuptools wheel diff --git a/.github/workflows/collect_changes.yml b/.github/workflows/collect_changes.yml index 7db5e6e..12da36c 100644 --- a/.github/workflows/collect_changes.yml +++ b/.github/workflows/collect_changes.yml @@ -12,9 +12,9 @@ jobs: with: ref: "main" fetch-depth: 0 - - uses: "actions/setup-python@v5" + - uses: "actions/setup-python@v6" with: - python-version: "3.11" + python-version: "3.x" - name: "Setup git" run: | git config user.name pulpbot diff --git a/.github/workflows/cookiecutter.yml b/.github/workflows/cookiecutter.yml index 4f706c4..cacd772 100644 --- a/.github/workflows/cookiecutter.yml +++ b/.github/workflows/cookiecutter.yml @@ -22,9 +22,9 @@ jobs: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp-cli-ostree" - name: "Set up Python" - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: - python-version: "3.11" + python-version: "3.x" - name: "Setup git" run: | git config user.name pulpbot @@ -57,4 +57,51 @@ jobs: env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true + update-dependencies: + runs-on: "ubuntu-latest" + steps: + - uses: "actions/checkout@v5" + with: + repository: "pulp/pulp-cli" + path: "pulp-cli" + - uses: "actions/checkout@v5" + with: + token: "${{ secrets.RELEASE_TOKEN }}" + path: "pulp-cli-ostree" + - name: "Set up Python" + uses: "actions/setup-python@v6" + with: + python-version: "3.x" + - name: "Setup git" + run: | + git config user.name pulpbot + git config user.email pulp-infra@redhat.com + - name: "Install python dependencies" + run: | + pip install packaging tomlkit + - name: "Apply cookiecutter templates" + run: | + ../pulp-cli/cookiecutter/update_pulp_cli.py + if [ "$(git status --porcelain)" ] + then + git add . + git commit -m "Update CLI and GLUE" + fi + - name: "Create Pull Request" + uses: "peter-evans/create-pull-request@v7" + id: "create_pr" + with: + token: "${{ secrets.RELEASE_TOKEN }}" + title: "Update CLI and GLUE" + body: "" + branch: "update_cli" + delete-branch: true + path: "pulp-cli-ostree" + - 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 ... diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d5fb2a8..b6fbe30 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,7 +12,7 @@ jobs: matrix: python: - "3.11" - - "3.13" + - "3.14" steps: - uses: "actions/checkout@v5" - uses: "actions/cache@v4" @@ -27,7 +27,7 @@ jobs: with: name: "pulp_cli_packages" - name: "Set up Python" - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: python-version: "${{ matrix.python }}" - name: "Install python dependencies" diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a91a349..41d8d7f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -30,9 +30,9 @@ jobs: with: fetch-depth: 0 - name: "Set up Python" - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: - python-version: "3.11" + python-version: "3.x" - name: "Install python dependencies" run: | pip install toml pygithub diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml index 912d1aa..0d3a228 100644 --- a/.github/workflows/pr_checks.yml +++ b/.github/workflows/pr_checks.yml @@ -22,15 +22,15 @@ jobs: - uses: "actions/checkout@v5" with: fetch-depth: 0 - - uses: "actions/setup-python@v5" + - uses: "actions/setup-python@v6" with: - python-version: "3.12" + python-version: "3.x" - 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@v7" + - uses: "actions/github-script@v8" name: "Apply PR Labels" with: script: | diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e5392d7..aeb89e9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -20,7 +20,7 @@ jobs: with: name: "pulp_cli_packages" - name: "Set up Python" - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: python-version: "3.x" - name: "Install dependencies" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 751f35a..3c40ec1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: with: token: "${{ secrets.RELEASE_TOKEN }}" - name: "Set up Python" - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: python-version: "3.x" - name: "Install dependencies" diff --git a/.github/workflows/release_branch.yml b/.github/workflows/release_branch.yml index f81ea9b..be0c5e5 100644 --- a/.github/workflows/release_branch.yml +++ b/.github/workflows/release_branch.yml @@ -11,9 +11,9 @@ jobs: with: token: "${{ secrets.RELEASE_TOKEN }}" - name: "Set up Python" - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: - python-version: "3.11" + python-version: "3.x" - name: "Setup git" run: | git config user.name pulpbot @@ -41,7 +41,7 @@ jobs: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true - name: "Add Backport Label for new Branch" - uses: "actions/github-script@v7" + uses: "actions/github-script@v8" with: script: | const { NEW_BRANCH } = process.env; diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e21fde4..9d953d3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,7 +46,7 @@ jobs: with: name: "pulp_cli_packages" - name: "Set up Python" - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: python-version: "${{ matrix.python }}" allow-prereleases: true diff --git a/lint_requirements.txt b/lint_requirements.txt index ec0bf54..e5b20a4 100644 --- a/lint_requirements.txt +++ b/lint_requirements.txt @@ -1,9 +1,9 @@ # Lint requirements -black==25.1.0 +black==25.9.0 flake8==7.3.0 flake8-pyproject==1.2.3 -isort==6.0.1 -mypy==1.17.1 +isort==6.1.0 +mypy==1.18.2 shellcheck-py==0.11.0.1 # Type annotation stubs