Merge pull request #156 from EricKolibacz/renovate/all

Update all dependencies

.github/workflows/code_style_checks.yml

@@ -19,7 +19,7 @@ jobs:
         python-version: ["3.10"]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install poetry
       run: pipx install poetry
     - name: Set up Python ${{ matrix.python-version }}

.github/workflows/python_tests.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install poetry
       run: pipx install poetry
     - name: Set up Python 3.10

CHANGELOG

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.2.5
+
+* Update dependencies (github actions, python version, aiohttp, numpy, geoalchemy, pylint, gunicorn)
+
+
 ## 1.2.4
 
 * Replace BVG(/VBB)-API with local instance for more stability

oeffikator/Dockerfile

@@ -1,11 +1,11 @@
 # From the Fastapi website (https://fastapi.tiangolo.com/deployment/docker/#docker-image-with-poetry)
-FROM python:3.11 as requirements-stage
+FROM python:3.12 as requirements-stage
 # create requirements.txt from poetry
 WORKDIR /tmp
 RUN pip install poetry
 COPY . /tmp/
 RUN poetry build && poetry export -f requirements.txt --output requirements.txt --without-hashes --without code_check,test
-FROM python:3.11
+FROM python:3.12
 WORKDIR /code
 # install required python packages
 COPY --from=requirements-stage /tmp/requirements.txt /code/requirements.txt

oeffikator/settings.py

@@ -1,5 +1,5 @@
 """Implements the settings for the oeffikator container"""
-from pydantic import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 # pylint: disable=R0903,R0801
@@ -15,9 +15,4 @@ class Settings(BaseSettings):
     max_east: float = 13.55
     max_south: float = 52.42
     max_north: float = 52.59
-
-    class Config:
-        """Defines the source for the settings"""
-
-        env_prefix = "OEFFI_"
-        secrets_dir = "/run/secrets"
+    model_config = SettingsConfigDict(env_prefix="OEFFI_", secrets_dir="/run/secrets")

oeffikator/sql_app/schemas.py

@@ -1,5 +1,5 @@
 """Pydantic database table models (and helpers)"""
-from pydantic import BaseModel
+from pydantic import ConfigDict, BaseModel
 
 # pylint: disable=R0903
 
@@ -17,11 +17,7 @@ class Request(RequestBase):
 
     id: int
     date: str
-
-    class Config:
-        """For pydantic configuration"""
-
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class LocationBase(BaseModel):
@@ -30,11 +26,7 @@ class LocationBase(BaseModel):
     address: str
     geom: str
     request_id: int
-
-    class Config:
-        """For pydantic configuration"""
-
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class LocationCreate(LocationBase):
@@ -45,11 +37,7 @@ class Location(LocationBase):
     """Pydantic model for adding attributes for reading"""
 
     id: int
-
-    class Config:
-        """For pydantic configuration"""
-
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class LocationAliasBase(BaseModel):
@@ -67,11 +55,7 @@ class LocationAlias(LocationAliasBase):
 
     id: int
     location_id: int
-
-    class Config:
-        """For pydantic configuration"""
-
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class TripBase(BaseModel):
@@ -91,8 +75,4 @@ class Trip(TripBase):
     """Pydantic model for adding attributes for reading"""
 
     id: int
-
-    class Config:
-        """For pydantic configuration"""
-
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)

pyproject.toml

@@ -1,35 +1,36 @@
 [tool.poetry]
 name = "oeffikator"
-version = "1.2.4"
+version = "1.2.5"
 description = "A visualisation tool for commuting times on public transport"
 authors = ["Eric Kolibacz <[email protected]>"]
 license = "GNU GPLv3"
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = ">=3.10,<3.13"
 pandas = "^2.0.0"
-numpy = "^1.24.0"
+numpy = "^1.26.1"
 scipy = "^1.9.3"
 requests = "^2.28.1"
 geopy = "^2.3.0"
 nest-asyncio = "^1.5.6"
 jupyter = "^1.0.0"
 scikit-learn = "^1.2.0"
-fastapi = "^0.95.0"
-uvicorn = "^0.22.0"
+fastapi = "^0.104.0"
+uvicorn = "^0.23.0"
 sqlalchemy = "^2.0.0"
-geoalchemy2 = "^0.13.1"
+geoalchemy2 = "^0.14.0"
 psycopg2-binary = "^2.9.5"
 shapely = "^2.0.0"
-aiohttp = "^3.8.4"
+aiohttp = "^3.9.0b0"
 asyncio = "^3.4.3"
 pytz = "^2022.7.1"
+pydantic-settings = "^2.0.3"
 
 [tool.poetry.group.code_check.dependencies]
 isort = "^5.11.4"
 black = {extras = ["jupyter"], version = "^23.0.0"}
-pylint = "^2.15.9"
+pylint = "^3.0.0"
 pycodestyle = "^2.10.0"
 nbqa = "^1.6.0"
 
@@ -45,7 +46,7 @@ dash = "^2.8.1"
 matplotlib = "^3.7.0"
 folium = "^0.14.0"
 imageio = "^2.25.1"
-gunicorn = "^20.1.0"
+gunicorn = "^21.0.0"
 
 [build-system]
 requires = ["poetry-core"]

visualization/settings.py

@@ -1,5 +1,5 @@
 """Implements the settings for the oeffikator container"""
-from pydantic import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 # pylint: disable=R0903,R0801
@@ -11,8 +11,4 @@ class Settings(BaseSettings):
     max_east: float = 13.55
     max_south: float = 52.42
     max_north: float = 52.59
-
-    class Config:
-        """Defines the source for the settings"""
-
-        env_prefix = "OEFFI_"
+    model_config = SettingsConfigDict(env_prefix="OEFFI_")