Bump cookiecutter template to 57e9b7 (#232)

# Changes - bumped cookiecutter template to robert-koch-institut/mex-template@57e9b7 --------- Co-authored-by: Nicolas Drebenstedt <[email protected]>
robert-koch-institut · Jan 15, 2025 · 3c81b56 · 3c81b56
1 parent f8c103f
commit 3c81b56
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 34 deletions.
diff --git a/.cruft.json b/.cruft.json
@@ -1,13 +1,14 @@
 {
   "template": "https://github.com/robert-koch-institut/mex-template",
-  "commit": "a4f25ab84f9e485ad77eb03663a9cf486f7a5826",
+  "commit": "57e9b752fed460f5542bda226467210d0135f4fb",
   "checkout": null,
   "context": {
     "cookiecutter": {
       "project_name": "backend",
       "short_summary": "Backend server for the RKI metadata exchange.",
       "long_summary": "The `mex-backend` package is a multi-purpose backend application with an HTTP-API. It provides endpoints to ingest data from ETL-pipelines, for a metadata editor application, and for publishing pipelines to extract standardized data for use in upstream frontend applications.",
-      "_template": "https://github.com/robert-koch-institut/mex-template"
+      "_template": "https://github.com/robert-koch-institut/mex-template",
+      "_commit": "57e9b752fed460f5542bda226467210d0135f4fb"
     }
   },
   "directory": null

diff --git a/.github/workflows/cookiecutter.yml b/.github/workflows/cookiecutter.yml
@@ -13,8 +13,10 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  PIP_NO_OPTION: on
+  PDM_CHECK_UPDATE: False
+  PIP_DISABLE_PIP_VERSION_CHECK: on
   PIP_NO_CLEAN: on
+  PIP_NO_INPUT: on
   PIP_PREFER_BINARY: on
 
 jobs:

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -8,8 +8,10 @@ on:
   workflow_dispatch:
 
 env:
-  PIP_NO_OPTION: on
+  PDM_CHECK_UPDATE: False
+  PIP_DISABLE_PIP_VERSION_CHECK: on
   PIP_NO_CLEAN: on
+  PIP_NO_INPUT: on
   PIP_PREFER_BINARY: on
 
 permissions:

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -12,8 +12,10 @@ on:
   workflow_dispatch:
 
 env:
-  PIP_NO_OPTION: on
+  PDM_CHECK_UPDATE: False
+  PIP_DISABLE_PIP_VERSION_CHECK: on
   PIP_NO_CLEAN: on
+  PIP_NO_INPUT: on
   PIP_PREFER_BINARY: on
 
 concurrency:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,8 +15,10 @@ on:
         required: true
 
 env:
-  PIP_NO_OPTION: on
+  PDM_CHECK_UPDATE: False
+  PIP_DISABLE_PIP_VERSION_CHECK: on
   PIP_NO_CLEAN: on
+  PIP_NO_INPUT: on
   PIP_PREFER_BINARY: on
 
 permissions:
@@ -131,6 +133,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
+          ref: ${{ needs.release.outputs.tag }}
 
       - name: Cache requirements
         uses: actions/cache@v4
@@ -153,7 +156,6 @@ jobs:
       - name: Build wheel and sdist distros and create a github release
         env:
           GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
-          PDM_CHECK_UPDATE: False
         run: |
           gh release create ${{ needs.release.outputs.tag }} --generate-notes --latest --verify-tag
           pdm build --dest dist

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -12,8 +12,10 @@ on:
   workflow_dispatch:
 
 env:
-  PIP_NO_OPTION: on
+  PDM_CHECK_UPDATE: False
+  PIP_DISABLE_PIP_VERSION_CHECK: on
   PIP_NO_CLEAN: on
+  PIP_NO_INPUT: on
   PIP_PREFER_BINARY: on
 
 concurrency:

diff --git 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.8.3
+    rev: v0.9.1
     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.22.0
+    rev: 2.22.2
     hooks:
       - id: pdm-lock-check
         name: pdm

diff --git a/Dockerfile b/Dockerfile
@@ -11,9 +11,10 @@ LABEL org.opencontainers.image.vendor="robert-koch-institut"
 ENV PYTHONUNBUFFERED=1
 ENV PYTHONOPTIMIZE=1
 
-ENV PIP_PROGRESS_BAR=off
-ENV PIP_PREFER_BINARY=on
 ENV PIP_DISABLE_PIP_VERSION_CHECK=on
+ENV PIP_NO_INPUT: on
+ENV PIP_PREFER_BINARY=on
+ENV PIP_PROGRESS_BAR=off
 
 ENV MEX_BACKEND_HOST=0.0.0.0
 

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Robert Koch-Institut
+Copyright (c) 2025 Robert Koch-Institut
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/pdm.lock b/pdm.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -25,7 +25,7 @@ optional-dependencies.dev = [
     "pytest-cov>=6,<7",
     "pytest-random-order>=1,<2",
     "pytest>=8,<9",
-    "ruff>=0.8,<1",
+    "ruff>=0.9,<1",
     "sphinx>=8,<9",
     "types-pytz>=2024,<2025",
 ]
@@ -116,6 +116,12 @@ ignore = [
 select = ["ALL"]
 
 [tool.ruff.lint.per-file-ignores]
+"mex/backend/logging.py" = [
+    "A005",     # Allow custom logging module to shadow standard-library
+]
+"mex/backend/types.py" = [
+    "A005",     # Allow custom types module to shadow standard-library
+]
 "docs/**" = [
     "INP001",   # Docs folder does not need to be a package
 ]

diff --git a/requirements.txt b/requirements.txt
@@ -2,4 +2,3 @@ cruft==2.16.0
 mex-release==0.3.0
 pdm==2.22.1
 pre-commit==4.0.1
-wheel==0.45.1
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -325,14 +325,14 @@ def _match_organization_items(dummy_data: dict[str, AnyExtractedModel]) -> None:
     # remove the merged item for org2
     connector.commit(
         f"""\
-MATCH(n) WHERE n.identifier='{dummy_data['organization_2'].stableTargetId}'
+MATCH(n) WHERE n.identifier='{dummy_data["organization_2"].stableTargetId}'
 DETACH DELETE n;"""
     )
     # connect the extracted item for org2 with the merged item for org1
     connector.commit(
         f"""\
-MATCH(n :ExtractedOrganization) WHERE n.identifier = '{dummy_data['organization_2'].identifier}'
-MATCH(m :MergedOrganization) WHERE m.identifier = '{dummy_data['organization_1'].stableTargetId}'
+MATCH(n :ExtractedOrganization) WHERE n.identifier = '{dummy_data["organization_2"].identifier}'
+MATCH(m :MergedOrganization) WHERE m.identifier = '{dummy_data["organization_1"].stableTargetId}'
 MERGE (n)-[:stableTargetId {{position:0}}]->(m);"""
     )
     # clear the identity provider cache to refresh the `stableTargetId` property on org2