From ebdb1e0e99ad17d2e4dbd44805d31f18200b9a67 Mon Sep 17 00:00:00 2001 From: RKI | Metadata Exchange <121876825+RKIMetadataExchange@users.noreply.github.com> Date: Fri, 8 Nov 2024 14:41:34 +0100 Subject: [PATCH] Bump cookiecutter template to af56c8 (#326) # Changes - bumped cookiecutter template to https://github.com/robert-koch-institut/mex-template/commit/af56c8 --------- Signed-off-by: Nicolas Drebenstedt <897972+cutoffthetop@users.noreply.github.com> Co-authored-by: Nicolas Drebenstedt <897972+cutoffthetop@users.noreply.github.com> Co-authored-by: Nicolas Drebenstedt --- .cruft.json | 2 +- .github/workflows/cookiecutter.yml | 11 +---------- .github/workflows/release.yml | 11 +---------- .pre-commit-config.yaml | 4 ++-- requirements.txt | 4 ++-- 5 files changed, 7 insertions(+), 25 deletions(-) diff --git a/.cruft.json b/.cruft.json index 334e273a..bc2fcaf2 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "checkout": null, - "commit": "6c467f8809dcc640c3b7aab80e42f3af1f89b1bd", + "commit": "af56c8fa17144906e94518391acc9795d5f2dc89", "context": { "cookiecutter": { "project_name": "common", diff --git a/.github/workflows/cookiecutter.yml b/.github/workflows/cookiecutter.yml index a06f00f4..4862c11a 100644 --- a/.github/workflows/cookiecutter.yml +++ b/.github/workflows/cookiecutter.yml @@ -52,16 +52,7 @@ jobs: SIGNING_PUB: ${{ secrets.SIGNING_PUB }} run: | eval "$(ssh-agent -s)" - install --directory ~/.ssh --mode 700 - base64 -d <<< '${{ secrets.SIGNING_KEY }}' > ~/.ssh/mex - base64 -d <<< '${{ secrets.SIGNING_PUB }}' > ~/.ssh/mex.pub - chmod 600 ~/.ssh/* - ssh-add ~/.ssh/mex - git config --local user.email ${{ vars.MEX_BOT_EMAIL }} - git config --local user.name ${{ vars.MEX_BOT_USER }} - git config --local gpg.format ssh - git config --local user.signingkey ~/.ssh/mex.pub - git config --local commit.gpgsign true + pdm setup-commit-signing - name: Update template env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1e34091e..5d63d9f7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,16 +63,7 @@ jobs: SIGNING_PUB: ${{ secrets.SIGNING_PUB }} run: | eval "$(ssh-agent -s)" - install --directory ~/.ssh --mode 700 - base64 -d <<< '${{ secrets.SIGNING_KEY }}' > ~/.ssh/mex - base64 -d <<< '${{ secrets.SIGNING_PUB }}' > ~/.ssh/mex.pub - chmod 600 ~/.ssh/* - ssh-add ~/.ssh/mex - git config --local user.email ${{ vars.MEX_BOT_EMAIL }} - git config --local user.name ${{ vars.MEX_BOT_USER }} - git config --local gpg.format ssh - git config --local user.signingkey ~/.ssh/mex.pub - git config --local commit.gpgsign true + pdm setup-commit-signing - name: Release new version id: release diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5582b64d..b0229369 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ default_language_version: python: python3.11 repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.9 + rev: v0.7.2 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] @@ -25,7 +25,7 @@ repos: - id: fix-byte-order-marker name: byte-order - repo: https://github.com/pdm-project/pdm - rev: 2.19.1 + rev: 2.19.3 hooks: - id: pdm-lock-check name: pdm diff --git a/requirements.txt b/requirements.txt index 6e135e4d..24c29632 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ cruft==2.15.0 -mex-release==0.2.0 -pdm==2.19.3 +mex-release==0.3.0 +pdm==2.20.0.post1 pre-commit==4.0.1 wheel==0.44.0