From 156beb5b87c13df0046531a3db8350c9c28d895a Mon Sep 17 00:00:00 2001 From: paul121 Date: Tue, 28 Jan 2020 16:36:07 -0800 Subject: [PATCH] Update fastAPI==0.47.1 and specify pydantic==v1.4 to include v1 pydantic upgrades. --- backend/app/app/api/api_v1/endpoints/users.py | 2 +- backend/app/app/api/api_v1/endpoints/utils.py | 2 +- backend/app/app/crud/farm_token.py | 2 +- backend/app/app/models/api_model.py | 2 +- backend/backend.dockerfile | 2 +- backend/celeryworker.dockerfile | 2 +- backend/tests.dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/app/app/api/api_v1/endpoints/users.py b/backend/app/app/api/api_v1/endpoints/users.py index 966fe12..2b29f18 100644 --- a/backend/app/app/api/api_v1/endpoints/users.py +++ b/backend/app/app/api/api_v1/endpoints/users.py @@ -2,7 +2,7 @@ from fastapi import APIRouter, Body, Depends, HTTPException from fastapi.encoders import jsonable_encoder -from pydantic.types import EmailStr +from pydantic.networks import EmailStr from sqlalchemy.orm import Session from app import crud diff --git a/backend/app/app/api/api_v1/endpoints/utils.py b/backend/app/app/api/api_v1/endpoints/utils.py index 4353f67..e6a8b67 100644 --- a/backend/app/app/api/api_v1/endpoints/utils.py +++ b/backend/app/app/api/api_v1/endpoints/utils.py @@ -1,5 +1,5 @@ from fastapi import APIRouter, Depends, Security, HTTPException -from pydantic.types import EmailStr +from pydantic.networks import EmailStr from sqlalchemy.orm import Session from app import crud diff --git a/backend/app/app/crud/farm_token.py b/backend/app/app/crud/farm_token.py index a553dcc..d099626 100644 --- a/backend/app/app/crud/farm_token.py +++ b/backend/app/app/crud/farm_token.py @@ -18,7 +18,7 @@ def create_farm_token(db: Session, token: FarmTokenCreate): def update_farm_token(db: Session, token: FarmToken, token_in: FarmTokenUpdate): token_data = jsonable_encoder(token) - update_data = token_in.dict(skip_defaults=True) + update_data = token_in.dict(exclude_unset=True) for field in token_data: if field in update_data: setattr(token, field, update_data[field]) diff --git a/backend/app/app/models/api_model.py b/backend/app/app/models/api_model.py index f678b85..e87ebdd 100644 --- a/backend/app/app/models/api_model.py +++ b/backend/app/app/models/api_model.py @@ -4,4 +4,4 @@ class APIModel(BaseModel): class Config(BaseConfig): orm_mode = True - allow_population_by_alias = True + allow_population_by_field_name = True diff --git a/backend/backend.dockerfile b/backend/backend.dockerfile index 183ab8f..996e651 100644 --- a/backend/backend.dockerfile +++ b/backend/backend.dockerfile @@ -1,6 +1,6 @@ FROM tiangolo/uvicorn-gunicorn-fastapi:python3.7 -RUN pip install celery~=4.3 passlib[bcrypt] tenacity requests emails "fastapi==0.30.0" uvicorn gunicorn pyjwt python-multipart email_validator jinja2 psycopg2-binary alembic SQLAlchemy "farmOS==0.1.5" +RUN pip install celery~=4.3 passlib[bcrypt] tenacity requests emails "fastapi==0.47.1" "pydantic==1.4" uvicorn gunicorn pyjwt python-multipart email_validator jinja2 psycopg2-binary alembic SQLAlchemy "farmOS==0.1.5" # For development, Jupyter remote kernel, Hydrogen # Using inside the container: diff --git a/backend/celeryworker.dockerfile b/backend/celeryworker.dockerfile index 654fb2d..3952875 100644 --- a/backend/celeryworker.dockerfile +++ b/backend/celeryworker.dockerfile @@ -1,6 +1,6 @@ FROM python:3.7 -RUN pip install raven celery~=4.3 passlib[bcrypt] tenacity requests "fastapi==0.30.0" emails pyjwt email_validator jinja2 psycopg2-binary alembic SQLAlchemy "farmOS==0.1.5" +RUN pip install raven celery~=4.3 passlib[bcrypt] tenacity requests "fastapi==0.47.1" "pydantic==1.4" emails pyjwt email_validator jinja2 psycopg2-binary alembic SQLAlchemy "farmOS==0.1.5" # For development, Jupyter remote kernel, Hydrogen # Using inside the container: diff --git a/backend/tests.dockerfile b/backend/tests.dockerfile index be84fb5..00244b0 100644 --- a/backend/tests.dockerfile +++ b/backend/tests.dockerfile @@ -1,6 +1,6 @@ FROM python:3.7 -RUN pip install requests pytest tenacity passlib[bcrypt] celery~=4.3 "fastapi==0.30.0" pyjwt psycopg2-binary SQLAlchemy "farmOS==0.1.5" +RUN pip install requests pytest tenacity passlib[bcrypt] celery~=4.3 "fastapi==0.47.1" "pydantic==1.4" pyjwt psycopg2-binary SQLAlchemy "farmOS==0.1.5" # For development, Jupyter remote kernel, Hydrogen # Using inside the container: