Bump cookiecutter template to 773777 (#40)

# Changes - bumped cookiecutter template to robert-koch-institut/mex-template@773777 --------- Co-authored-by: Nicolas Drebenstedt <[email protected]>
robert-koch-institut · Apr 2, 2024 · d84bb8a · d84bb8a
1 parent 165de7d
commit d84bb8a
Show file tree

Hide file tree

Showing 19 changed files with 701 additions and 299 deletions.
diff --git a/.cruft.json b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/robert-koch-institut/mex-template",
-  "commit": "061bc1d37c9738740fc572861d2fcc54eed352b3",
+  "commit": "7737771881fde49031d915e2a18507981c100ee5",
   "checkout": null,
   "context": {
     "cookiecutter": {

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,12 +2,21 @@ fail_fast: false
 default_language_version:
   python: python3.11
 repos:
+  - repo: https://github.com/psf/black
+    rev: 24.3.0
+    hooks:
+      - id: black
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.3.5
+    hooks:
+      - id: ruff
+        args: [--fix, --exit-non-zero-on-fix]
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
       - id: pretty-format-json
         name: json
-        args: [--autofix, --no-sort-keys, --indent=4, --no-ensure-ascii]
+        args: [--autofix, --indent=4, --no-ensure-ascii]
         exclude: .cruft.json
       - id: check-yaml
         name: yaml
@@ -18,7 +27,7 @@ repos:
       - id: fix-byte-order-marker
         name: byte-order
   - repo: https://github.com/pdm-project/pdm
-    rev: 2.12.4
+    rev: 2.13.2
     hooks:
       - id: pdm-lock-check
         name: pdm
diff --git a/Makefile b/Makefile
@@ -2,6 +2,8 @@
 all: install test
 test: linter
 
+LATEST = $(shell git describe --tags $(shell git rev-list --tags --max-count=1))
+
 setup:
 	# install meta requirements system-wide
 	@ echo installing requirements; \

diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@ Conceptual and machine-readable versions of the MEx metadata model.
 
 [![linting](https://github.com/robert-koch-institut/mex-model/actions/workflows/linting.yml/badge.svg)](https://github.com/robert-koch-institut/mex-model/actions/workflows/linting.yml)
 [![cve-scan](https://github.com/robert-koch-institut/mex-model/actions/workflows/cve-scan.yml/badge.svg)](https://github.com/robert-koch-institut/mex-model/actions/workflows/cve-scan.yml)
+[![documentation](https://github.com/robert-koch-institut/mex-model/actions/workflows/documentation.yml/badge.svg)](https://robert-koch-institut.github.io/mex-model)
 
 ## project
 

diff --git a/mex/model/entities/access-platform.json b/mex/model/entities/access-platform.json
@@ -3,16 +3,17 @@
     "$schema": "http://json-schema.org/draft/2020-12/schema",
     "properties": {
         "alternativeTitle": {
+            "default": [],
             "items": {
                 "$ref": "/schema/fields/text"
             },
             "sameAs": [
                 "http://purl.org/dc/terms/alternative"
             ],
-            "type": "array",
-            "default": []
+            "type": "array"
         },
         "contact": {
+            "default": [],
             "items": {
                 "anyOf": [
                     {
@@ -29,23 +30,19 @@
             "sameAs": [
                 "http://www.w3.org/ns/dcat#contactPoint"
             ],
-            "type": "array",
-            "default": []
+            "type": "array"
         },
         "description": {
+            "default": [],
             "items": {
                 "$ref": "/schema/fields/text"
             },
             "sameAs": [
                 "http://purl.org/dc/terms/description"
             ],
-            "type": "array",
-            "default": []
+            "type": "array"
         },
         "endpointDescription": {
-            "sameAs": [
-                "http://www.w3.org/ns/dcat#endpointDescription"
-            ],
             "anyOf": [
                 {
                     "$ref": "/schema/fields/link"
@@ -54,16 +51,19 @@
                     "type": "null"
                 }
             ],
-            "default": null
+            "default": null,
+            "sameAs": [
+                "http://www.w3.org/ns/dcat#endpointDescription"
+            ]
         },
         "endpointType": {
             "anyOf": [
                 {
                     "$ref": "/schema/entities/concept#/identifier",
-                    "useScheme": "https://mex.rki.de/item/api-type",
                     "examples": [
                         "https://mex.rki.de/item/api-type-1"
-                    ]
+                    ],
+                    "useScheme": "https://mex.rki.de/item/api-type"
                 },
                 {
                     "type": "null"
@@ -110,14 +110,14 @@
             "type": "string"
         },
         "landingPage": {
+            "default": [],
             "items": {
                 "$ref": "/schema/fields/link"
             },
             "sameAs": [
                 "http://www.w3.org/ns/dcat#landingPage"
             ],
-            "type": "array",
-            "default": []
+            "type": "array"
         },
         "stableTargetId": {
             "$ref": "/schema/fields/identifier"
@@ -133,24 +133,24 @@
             "useScheme": "https://mex.rki.de/item/technical-accessibility"
         },
         "title": {
+            "default": [],
             "items": {
                 "$ref": "/schema/fields/text"
             },
             "sameAs": [
                 "http://purl.org/dc/terms/title"
             ],
-            "type": "array",
-            "default": []
+            "type": "array"
         },
         "unitInCharge": {
+            "default": [],
             "items": {
                 "$ref": "/schema/entities/organizational-unit#/identifier"
             },
             "sameAs": [
                 "http://dcat-ap.de/def/dcatde/maintainer"
             ],
-            "type": "array",
-            "default": []
+            "type": "array"
         }
     },
     "required": [