Skip to content

Commit

Permalink
feature/template-maintenance (#75)
Browse files Browse the repository at this point in the history
# 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 <[email protected]>
Co-authored-by: RKI | Metadata Exchange <[email protected]>
  • Loading branch information
cutoffthetop and RKIMetadataExchange authored Oct 11, 2024
1 parent bae8644 commit 382febf
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/renovatebot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ htmlcov/
.cache
nosetests.xml
coverage.xml
test*.jpeg
test*.png
*.cover
*.jpeg
*.py,cover
.hypothesis/
.pytest_cache/
Expand Down
3 changes: 2 additions & 1 deletion mex-{{ cookiecutter.project_name }}/.dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ htmlcov/
.cache
nosetests.xml
coverage.xml
test*.jpeg
test*.png
*.cover
*.jpeg
*.py,cover
.hypothesis/
.pytest_cache/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
3 changes: 2 additions & 1 deletion mex-{{ cookiecutter.project_name }}/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ htmlcov/
.cache
nosetests.xml
coverage.xml
test*.jpeg
test*.png
*.cover
*.jpeg
*.py,cover
.hypothesis/
.pytest_cache/
Expand Down
4 changes: 2 additions & 2 deletions mex-{{ cookiecutter.project_name }}/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions mex-{{ cookiecutter.project_name }}/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ authors = [{ name = "MEx Team", email = "[email protected]" }]
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]
Expand Down Expand Up @@ -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"
2 changes: 1 addition & 1 deletion mex-{{ cookiecutter.project_name }}/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 382febf

Please sign in to comment.