From 17d52c237f7ed11bf2d3ac61c8be58e06c76cba2 Mon Sep 17 00:00:00 2001 From: RKIMetadataExchange Date: Mon, 18 Nov 2024 07:59:16 +0000 Subject: [PATCH 1/2] Bump cookiecutter template to f3bf98 --- .cruft.json | 2 +- .github/workflows/renovatebot.yml | 4 ++++ .pre-commit-config.yaml | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cruft.json b/.cruft.json index 7dab88a2..e216f2e3 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "checkout": null, - "commit": "b0a2056a104f39cd18e6b395a27d18473caa73d7", + "commit": "f3bf981df5d829892200d2a41eafee331fa85715", "context": { "cookiecutter": { "project_name": "common", diff --git a/.github/workflows/renovatebot.yml b/.github/workflows/renovatebot.yml index 1c7eecc3..3cfb3c01 100644 --- a/.github/workflows/renovatebot.yml +++ b/.github/workflows/renovatebot.yml @@ -22,7 +22,11 @@ jobs: fetch-depth: 1 - name: Run renovatebot +<<<<<<< ours uses: renovatebot/github-action@v40.3.5 +======= + uses: renovatebot/github-action@v40.3.6 +>>>>>>> theirs env: RENOVATE_GIT_PRIVATE_KEY: ${{ secrets.GPG_SIGNING_KEY }} RENOVATE_REPOSITORIES: "robert-koch-institut/mex-common" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b0229369..ee8e3f2a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,13 +3,13 @@ default_language_version: python: python3.11 repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.7.2 + rev: v0.7.3 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] - id: ruff-format - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: pretty-format-json name: json @@ -25,7 +25,7 @@ repos: - id: fix-byte-order-marker name: byte-order - repo: https://github.com/pdm-project/pdm - rev: 2.19.3 + rev: 2.20.1 hooks: - id: pdm-lock-check name: pdm From 314d4a722388702b5ab4b24b2d610632a78e1e08 Mon Sep 17 00:00:00 2001 From: RKI | Metadata Exchange <121876825+RKIMetadataExchange@users.noreply.github.com> Date: Mon, 18 Nov 2024 09:36:58 +0100 Subject: [PATCH 2/2] Update dependency wheel to v0.45.0 (#335) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [wheel](https://redirect.github.com/pypa/wheel) ([changelog](https://wheel.readthedocs.io/en/stable/news.html)) | minor | `==0.44.0` -> `==0.45.0` | --- ### Release Notes
pypa/wheel (wheel) ### [`v0.45.0`](https://redirect.github.com/pypa/wheel/releases/tag/0.45.0) [Compare Source](https://redirect.github.com/pypa/wheel/compare/0.44.0...0.45.0) - Refactored the `convert` command to not need setuptools to be installed - Don't configure setuptools logging unless running `bdist_wheel` - Added a redirection from `wheel.bdist_wheel.bdist_wheel` to `setuptools.command.bdist_wheel.bdist_wheel` to improve compatibility with `setuptools`' latest fixes. Projects are still advised to migrate away from the deprecated module and import the `setuptools`' implementation explicitly. (PR by [@​abravalheri](https://redirect.github.com/abravalheri))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2035fcb8..7470a61a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ cruft==2.15.0 mex-release==0.3.0 pdm==2.20.1 pre-commit==4.0.1 -wheel==0.44.0 +wheel==0.45.0