From 02577532ee52f7f0ff702e492b4e61005773b06c Mon Sep 17 00:00:00 2001 From: hay-kot Date: Sun, 21 Mar 2021 17:14:35 -0800 Subject: [PATCH] more import errors --- .github/workflows/pytest.yml | 3 +-- .vscode/settings.json | 2 -- mealie/schema/user.py | 7 +++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 6b4c7910f..5df2230ca 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -50,5 +50,4 @@ jobs: #---------------------------------------------- - name: Run tests run: | - source .venv/bin/activate - pytest + poetry run pytest diff --git a/.vscode/settings.json b/.vscode/settings.json index 129576027..0b1a8fea8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,8 +3,6 @@ "python.pythonPath": ".venv/bin/python3.9", "python.linting.pylintEnabled": true, "python.linting.enabled": true, - "python.autoComplete.extraPaths": ["mealie", "mealie/mealie"], - "python.analysis.extraPaths": ["mealie", "mealie/mealie"], "python.testing.unittestEnabled": false, "python.testing.nosetestsEnabled": false, "python.testing.pytestEnabled": true, diff --git a/mealie/schema/user.py b/mealie/schema/user.py index 24c78617d..08075e6f3 100644 --- a/mealie/schema/user.py +++ b/mealie/schema/user.py @@ -1,13 +1,12 @@ -from typing import Any, Optional +from typing import Optional +from fastapi_camelcase import CamelModel from mealie.core.config import DEFAULT_GROUP from mealie.db.models.group import Group from mealie.db.models.users import User -from fastapi_camelcase import CamelModel -from pydantic.utils import GetterDict - from mealie.schema.category import CategoryBase from mealie.schema.meal import MealPlanInDB +from pydantic.utils import GetterDict class ChangePassword(CamelModel):