From 2159b53baa4c86d9c1b739260824b7f89f935759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=80=9A=E9=97=BB?= Date: Fri, 18 Mar 2022 16:11:03 +0800 Subject: [PATCH] fix: tox error 1. fix only 1 line between functions in model.py 2. fix more than 1 line at end of file in model.py 3. fix imported but not used in model.py 4. fix imported but not used in api.py 5. fix line too long in api.py 6. add local file to gitignore --- examples/industrial-ai-apiserver/.gitignore | 3 +++ examples/industrial-ai-apiserver/industrialai/db/api.py | 4 ++-- examples/industrial-ai-apiserver/industrialai/db/model.py | 4 +--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/examples/industrial-ai-apiserver/.gitignore b/examples/industrial-ai-apiserver/.gitignore index a101926..4049948 100644 --- a/examples/industrial-ai-apiserver/.gitignore +++ b/examples/industrial-ai-apiserver/.gitignore @@ -2,6 +2,9 @@ __pycache__/ *.py[cod] +# Build +E:\\dhuProject\\pecan-swagger\\examples\\industrial-ai-apiserver\\industrialai.db + # C extensions *.so diff --git a/examples/industrial-ai-apiserver/industrialai/db/api.py b/examples/industrial-ai-apiserver/industrialai/db/api.py index 2d5825d..3e45075 100644 --- a/examples/industrial-ai-apiserver/industrialai/db/api.py +++ b/examples/industrial-ai-apiserver/industrialai/db/api.py @@ -5,7 +5,6 @@ import os from pecan import abort from sqlalchemy import create_engine, func from sqlalchemy.orm import exc -from sqlalchemy.orm import joinedload from sqlalchemy.orm import sessionmaker logger = logging.getLogger(__name__) @@ -22,7 +21,8 @@ def get_engine(): return _ENGINE DB_URL = ( os.getenv("db_url") or - "sqlite:///E:\\dhuProject\\pecan-swagger\\examples\\industrial-ai-apiserver\\industrialai.db?check_same_thread=False" + "sqlite:///E:\\dhuProject\\pecan-swagger\\examples\\\ + industrial-ai-apiserver\\industrialai.db?check_same_thread=False" ) _ENGINE = create_engine(DB_URL, echo=True) return _ENGINE diff --git a/examples/industrial-ai-apiserver/industrialai/db/model.py b/examples/industrial-ai-apiserver/industrialai/db/model.py index 6c5c981..3c7492c 100644 --- a/examples/industrial-ai-apiserver/industrialai/db/model.py +++ b/examples/industrial-ai-apiserver/industrialai/db/model.py @@ -4,9 +4,7 @@ from sqlalchemy import DateTime from sqlalchemy.ext.declarative import declarative_base from sqlalchemy import ForeignKey from sqlalchemy import Integer -from sqlalchemy.orm import relationship from sqlalchemy import String -from sqlalchemy import Table Base = declarative_base() @@ -14,6 +12,7 @@ Base = declarative_base() def init_db(_ENGINE): Base.metadata.create_all(_ENGINE) + class User(Base): __tablename__ = 'user' id = Column(Integer, primary_key=True) @@ -32,4 +31,3 @@ class Role(Base): __tablename__ = 'role' id = Column(Integer, primary_key=True) title = Column(String(32)) - -- Gitee