Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
from typing import Callable

from sqlalchemy import create_engine, exc, orm
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import Session
from sqlalchemy.orm import Session, declarative_base

from carbonserver.api.errors import DBError, DBErrorEnum, DBException
from carbonserver.logger import logger
Expand Down
3 changes: 1 addition & 2 deletions carbonserver/carbonserver/database/database.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from sqlalchemy import create_engine
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import sessionmaker
from sqlalchemy.orm import declarative_base, sessionmaker

from carbonserver.config import settings

Expand Down
7 changes: 5 additions & 2 deletions carbonserver/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ dependencies = [
"bcrypt<5.0.0",
"python-dateutil<3.0.0",
"dependency-injector<5.0.0",
"fastapi<1.0.0,>=0.138.1",
# fastapi 0.140.5 renamed dependencies.utils.get_body_field to _get_body_field,
# which breaks fastapi-pagination (up to 0.15.15). Lift once it is fixed upstream.
# See https://github.com/uriyyo/fastapi-pagination/issues/1990
"fastapi<0.140.5,>=0.138.1",
"fastapi[standard]",
"httpx",
"httpx2>=2.0.0",
"pydantic[email]>=2.0.0,<3.0.0",
"pydantic-settings>=2.14.2,<3.0.0",
"psycopg2-binary<3.0.0",
Expand Down
Loading
Loading