From 382febffff2ead8fd4d1e66b411a1cd39a192446 Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt <897972+cutoffthetop@users.noreply.github.com> Date: Fri, 11 Oct 2024 09:09:11 +0200 Subject: [PATCH] feature/template-maintenance (#75) # Changes - clarify release step names - make python bound order consistent with deps - add PNGs to ignore files (for playwright testing) - update versions --------- Signed-off-by: Nicolas Drebenstedt <897972+cutoffthetop@users.noreply.github.com> Co-authored-by: RKI | Metadata Exchange <121876825+RKIMetadataExchange@users.noreply.github.com> --- .github/workflows/renovatebot.yml | 2 +- .gitignore | 3 ++- mex-{{ cookiecutter.project_name }}/.dockerignore | 3 ++- .../.github/workflows/release.yml | 4 ++-- .../.github/workflows/renovatebot.yml | 2 +- mex-{{ cookiecutter.project_name }}/.gitignore | 3 ++- .../.pre-commit-config.yaml | 4 ++-- mex-{{ cookiecutter.project_name }}/pyproject.toml | 12 ++++++------ mex-{{ cookiecutter.project_name }}/requirements.txt | 2 +- requirements.txt | 2 +- 10 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.github/workflows/renovatebot.yml b/.github/workflows/renovatebot.yml index 2ffdc02..1be9cfe 100644 --- a/.github/workflows/renovatebot.yml +++ b/.github/workflows/renovatebot.yml @@ -22,7 +22,7 @@ jobs: fetch-depth: 1 - name: Run renovatebot - uses: renovatebot/github-action@v40.2.7 + uses: renovatebot/github-action@v40.3.1 env: RENOVATE_GIT_PRIVATE_KEY: ${{ secrets.GPG_SIGNING_KEY }} RENOVATE_REPOSITORIES: "robert-koch-institut/mex-template" diff --git a/.gitignore b/.gitignore index dc23dfc..ca0a6cd 100644 --- a/.gitignore +++ b/.gitignore @@ -46,8 +46,9 @@ htmlcov/ .cache nosetests.xml coverage.xml +test*.jpeg +test*.png *.cover -*.jpeg *.py,cover .hypothesis/ .pytest_cache/ diff --git a/mex-{{ cookiecutter.project_name }}/.dockerignore b/mex-{{ cookiecutter.project_name }}/.dockerignore index adac9ee..5d04a72 100644 --- a/mex-{{ cookiecutter.project_name }}/.dockerignore +++ b/mex-{{ cookiecutter.project_name }}/.dockerignore @@ -47,8 +47,9 @@ htmlcov/ .cache nosetests.xml coverage.xml +test*.jpeg +test*.png *.cover -*.jpeg *.py,cover .hypothesis/ .pytest_cache/ diff --git a/mex-{{ cookiecutter.project_name }}/.github/workflows/release.yml b/mex-{{ cookiecutter.project_name }}/.github/workflows/release.yml index c9c9a85..dcbf708 100644 --- a/mex-{{ cookiecutter.project_name }}/.github/workflows/release.yml +++ b/mex-{{ cookiecutter.project_name }}/.github/workflows/release.yml @@ -116,14 +116,14 @@ jobs: run: | pdm export --self --output locked-requirements.txt --no-hashes --without dev - - name: 'Login to GitHub Container Registry' + - name: Login to container registry uses: docker/login-action@v3 with: registry: ghcr.io username: {% raw %}${{github.actor}}{% endraw %} password: {% raw %}${{secrets.GITHUB_TOKEN}}{% endraw %} - - name: 'Build Inventory Image' + - name: Build, tag and push docker image run: | docker build . \ --tag ghcr.io/robert-koch-institut/mex-{{ cookiecutter.project_name }}:latest \ diff --git a/mex-{{ cookiecutter.project_name }}/.github/workflows/renovatebot.yml b/mex-{{ cookiecutter.project_name }}/.github/workflows/renovatebot.yml index e683532..3844908 100644 --- a/mex-{{ cookiecutter.project_name }}/.github/workflows/renovatebot.yml +++ b/mex-{{ cookiecutter.project_name }}/.github/workflows/renovatebot.yml @@ -22,7 +22,7 @@ jobs: fetch-depth: 1 - name: Run renovatebot - uses: renovatebot/github-action@v40.2.7 + uses: renovatebot/github-action@v40.3.1 env: RENOVATE_GIT_PRIVATE_KEY: {% raw %}${{ secrets.GPG_SIGNING_KEY }}{% endraw %} RENOVATE_REPOSITORIES: "robert-koch-institut/mex-{{ cookiecutter.project_name }}" diff --git a/mex-{{ cookiecutter.project_name }}/.gitignore b/mex-{{ cookiecutter.project_name }}/.gitignore index dc23dfc..ca0a6cd 100644 --- a/mex-{{ cookiecutter.project_name }}/.gitignore +++ b/mex-{{ cookiecutter.project_name }}/.gitignore @@ -46,8 +46,9 @@ htmlcov/ .cache nosetests.xml coverage.xml +test*.jpeg +test*.png *.cover -*.jpeg *.py,cover .hypothesis/ .pytest_cache/ diff --git a/mex-{{ cookiecutter.project_name }}/.pre-commit-config.yaml b/mex-{{ cookiecutter.project_name }}/.pre-commit-config.yaml index f3041b7..d266616 100644 --- a/mex-{{ cookiecutter.project_name }}/.pre-commit-config.yaml +++ b/mex-{{ cookiecutter.project_name }}/.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.5.4 + rev: v0.6.5 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.17.1 + rev: 2.18.2 hooks: - id: pdm-lock-check name: pdm diff --git a/mex-{{ cookiecutter.project_name }}/pyproject.toml b/mex-{{ cookiecutter.project_name }}/pyproject.toml index ce276db..354ed41 100644 --- a/mex-{{ cookiecutter.project_name }}/pyproject.toml +++ b/mex-{{ cookiecutter.project_name }}/pyproject.toml @@ -6,17 +6,17 @@ authors = [{ name = "MEx Team", email = "mex@rki.de" }] readme = { file = "README.md", content-type = "text/markdown" } license = { file = "LICENSE" } urls = { Repository = "https://github.com/robert-koch-institut/mex-{{ cookiecutter.project_name }}" } -requires-python = "<3.13,>=3.11" +requires-python = ">=3.11,<3.13" dependencies = [] optional-dependencies.dev = [ "ipdb>=0.13.13,<1", - "mypy>=1.11.0,<2", + "mypy>=1.11.2,<2", "pytest-cov>=5.0.0,<6", "pytest-random-order>=1.1.1,<2", "pytest-xdist>=3.6.1,<4", - "pytest>=8.3.1,<9", - "ruff>=0.5.4,<1", - "sphinx>=7.4.5,<8", + "pytest>=8.3.3,<9", + "ruff>=0.6.5,<1", + "sphinx>=8.0.2,<9", ] [project.scripts] @@ -129,5 +129,5 @@ known-first-party = ["mex", "tests"] convention = "google" [build-system] -requires = ["pdm-backend==2.3.3"] +requires = ["pdm-backend==2.4.1"] build-backend = "pdm.backend" diff --git a/mex-{{ cookiecutter.project_name }}/requirements.txt b/mex-{{ cookiecutter.project_name }}/requirements.txt index be56672..df636af 100644 --- a/mex-{{ cookiecutter.project_name }}/requirements.txt +++ b/mex-{{ cookiecutter.project_name }}/requirements.txt @@ -1,5 +1,5 @@ cruft==2.15.0 mex-release @ git+https://github.com/robert-koch-institut/mex-release.git -pdm==2.18.1 +pdm==2.19.1 pre-commit==3.8.0 wheel==0.44.0 diff --git a/requirements.txt b/requirements.txt index be56672..df636af 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ cruft==2.15.0 mex-release @ git+https://github.com/robert-koch-institut/mex-release.git -pdm==2.18.1 +pdm==2.19.1 pre-commit==3.8.0 wheel==0.44.0