Skip to content

Commit

Permalink
Bump cookiecutter template to 25c36c (#65)
Browse files Browse the repository at this point in the history
# Changes

- bumped cookiecutter template to
robert-koch-institut/mex-template@25c36c

---------

Co-authored-by: Nicolas Drebenstedt <[email protected]>
  • Loading branch information
RKIMetadataExchange and cutoffthetop authored May 16, 2024
1 parent 80bd9b8 commit 68fd288
Show file tree
Hide file tree
Showing 10 changed files with 464 additions and 255 deletions.
2 changes: 1 addition & 1 deletion .cruft.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"template": "https://github.com/robert-koch-institut/mex-template",
"commit": "15dd517e9d8aebb087e1f0387cf726a8164e7913",
"commit": "25c36c49159f9309b55815b6606a8dfb66228858",
"checkout": null,
"context": {
"cookiecutter": {
Expand Down
4 changes: 4 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,11 @@ dmypy.json
*.db

# Default exports
*.ndjson
data/
identity.csv
schema.json
work/

# Docker specifics
**/.dockerignore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ jobs:
timeout-minutes: 10
steps:
- name: Build, tag and push docker image to ghcr
uses: GlueOps/github-actions-build-push-containers@v0.3
uses: GlueOps/github-actions-build-push-containers@v0.4
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

services:
neo4j:
image: neo4j:5.9-community
image: neo4j:5.19-community
env:
NEO4J_AUTH: neo4j/password
ports:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,7 @@ dmypy.json

# Default exports
*.ndjson
data/
identity.csv
schema.json
work/
2 changes: 1 addition & 1 deletion compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
timeout: 5s
retries: 5
neo4j:
image: neo4j:5.9-community
image: neo4j:5.19-community
environment:
- NEO4J_AUTH=neo4j/password
expose:
Expand Down
668 changes: 436 additions & 232 deletions pdm.lock

Large diffs are not rendered by default.

31 changes: 15 additions & 16 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@ license = { file = "LICENSE" }
urls = { Repository = "https://github.com/robert-koch-institut/mex-backend" }
requires-python = "<3.13,>=3.11"
dependencies = [
"fastapi>=0.110.1",
"httpx>=0.27.0",
"fastapi==0.111.0",
"httpx==0.27.0",
"mex-common@git+https://github.com/robert-koch-institut/[email protected]",
"neo4j>=5.18.0",
"pydantic>=2.6.4",
"uvicorn[standard]>=0.29.0",
"neo4j==5.20.0",
"pydantic==2.7.1",
"uvicorn[standard]==0.29.0",
]
optional-dependencies.dev = [
"black>=24.3.0",
"ipdb>=0.13.13",
"mypy>=1.9.0",
"pytest-cov>=4.1.0",
"pytest-random-order>=1.1.1",
"pytest>=8.1.1",
"ruff>=0.3.3",
"sphinx>=7.2.6",
"types-pytz>=2024.1.0",
"black==24.4.2",
"ipdb==0.13.13",
"mypy==1.10.0",
"pytest-cov==5.0.0",
"pytest-random-order==1.1.1",
"pytest==8.2.0",
"ruff==0.4.4",
"sphinx==7.3.7",
"types-pytz==2024.1.0.20240417",
]

[project.scripts]
Expand Down Expand Up @@ -61,7 +61,6 @@ unit = { cmd = "pdm run pytest -m 'not integration'" }
test = { cmd = "pdm run pytest" }
all = { composite = ["install-all", "lint", "test", "doc"] }


[tool.pydantic-mypy]
warn_untyped_fields = true

Expand Down Expand Up @@ -137,5 +136,5 @@ known-first-party = ["mex", "tests"]
convention = "google"

[build-system]
requires = ["pdm-backend==2.1.8"]
requires = ["pdm-backend==2.3.0"]
build-backend = "pdm.backend"
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cruft==2.15.0
pdm==2.15.2
pre-commit==3.7.0
pre-commit==3.7.1
wheel==0.43.0
2 changes: 0 additions & 2 deletions tests/ingest/test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

from mex.backend.graph.connector import GraphConnector
from mex.common.models import AnyExtractedModel
from mex.common.testing import Joker
from tests.conftest import MockedGraph

Payload = dict[str, list[dict[str, Any]]]
Expand Down Expand Up @@ -67,7 +66,6 @@ def test_bulk_insert_malformed(
"loc": ["body", "ExtractedContactPoint", 0, 1],
"msg": "Input should be a valid dictionary",
"input": "FAIL!",
"url": Joker(),
}
]
}
Expand Down

0 comments on commit 68fd288

Please sign in to comment.