Merge branch 'main' into renovate/all-minor-patch

# Conflicts: # server/Cargo.lock # server/calendar/Cargo.toml # server/main-api/Cargo.toml
TUM-Dev · Dec 21, 2023 · 8c9967c · 8c9967c
2 parents a783f3c + c1029d8
commit 8c9967c
Show file tree

Hide file tree

Showing 9 changed files with 460 additions and 459 deletions.
diff --git a/data/sources/01_areas-extended.yaml b/data/sources/01_areas-extended.yaml
@@ -1156,7 +1156,7 @@ taufkirchen-ottobrunn:
   coords: { lat: 48.05453, lon: 11.65308 }
 
 9378:
-  coords: { lat: 48.05226, lon: 11.65557 }
+  coords: { lat: 48.05236862253642, lon: 11.654884006956397 }
   osm: ["way/30081572"]
 
 9379:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -92,7 +92,7 @@ services:
       test: wget -q --spider http://localhost:3003/api/status
       retries: 5
       interval: 10s
-      start_period: 30s
+      start_period: 60s
   meilisearch:
     image: getmeili/meilisearch:v1.5.1
     restart: always

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,7 +1,7 @@
-mypy~=1.7.0
+mypy~=1.8.0
 pre-commit~=3.6.0
 pylint~=3.0.0
-sourcery~=1.14.0
+sourcery~=1.15.0
 types-Pillow~=10.1.0.0
 types-PyYAML~=6.0.12.10
 types-requests~=2.31.0.1