Skip to content

Commit 4bd4c18

Browse files
committed
fix flake8/isort issues
1 parent 050726c commit 4bd4c18

File tree

5 files changed

+13
-18
lines changed

5 files changed

+13
-18
lines changed

eve_sqlalchemy/examples/simple/tables.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,18 @@
1-
from sqlalchemy import Column, DateTime, ForeignKey, Integer, String, func
2-
from sqlalchemy.ext.declarative import declarative_base
1+
from sqlalchemy import Column, ForeignKey, Integer, String
32
from sqlalchemy.orm import column_property, relationship
43

5-
Base = declarative_base()
4+
from eve_sqlalchemy.declarative import BaseModel
65

76

8-
class CommonColumns(Base):
9-
__abstract__ = True
10-
_created = Column(DateTime, default=func.now())
11-
_updated = Column(DateTime, default=func.now(), onupdate=func.now())
12-
_etag = Column(String(40))
13-
14-
15-
class People(CommonColumns):
7+
class People(BaseModel):
168
__tablename__ = 'people'
179
id = Column(Integer, primary_key=True, autoincrement=True)
1810
firstname = Column(String(80))
1911
lastname = Column(String(120))
2012
fullname = column_property(firstname + " " + lastname)
2113

2214

23-
class Invoices(CommonColumns):
15+
class Invoices(BaseModel):
2416
__tablename__ = 'invoices'
2517
id = Column(Integer, primary_key=True, autoincrement=True)
2618
number = Column(Integer)

eve_sqlalchemy/tests/config/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
from sqlalchemy import Column, DateTime, String, func
55
from sqlalchemy.ext.declarative import declared_attr
6+
67
from eve_sqlalchemy.declarative import BaseModel
78

89

eve_sqlalchemy/tests/integration/collection_class_set.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from eve_sqlalchemy.declarative import BaseModel
99
from eve_sqlalchemy.tests import TestMinimal
1010

11-
1211
association_table = Table(
1312
'association', BaseModel.metadata,
1413
Column('left_id', Integer, ForeignKey('left.id')),

eve_sqlalchemy/tests/integration/get_none_values.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import unicode_literals
33

4-
from sqlalchemy import Column, DateTime, Integer, String, func
4+
from sqlalchemy import Column, Integer
55

66
from eve_sqlalchemy.config import DomainConfig, ResourceConfig
7-
from eve_sqlalchemy.tests import TestMinimal
8-
97
from eve_sqlalchemy.declarative import BaseModel
8+
from eve_sqlalchemy.tests import TestMinimal
109

1110

1211
class Node(BaseModel):
@@ -29,7 +28,8 @@ class Node(BaseModel):
2928
class TestGetNoneValues(TestMinimal):
3029

3130
def setUp(self, url_converters=None):
32-
super(TestGetNoneValues, self).setUp(SETTINGS, url_converters, BaseModel)
31+
super(TestGetNoneValues, self).setUp(SETTINGS, url_converters,
32+
BaseModel)
3333

3434
def bulk_insert(self):
3535
self.app.data.insert('nodes', [{'id': k} for k in range(1, 5)])

eve_sqlalchemy/tests/test_sql_tables.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import unicode_literals
33

4-
from sqlalchemy import Boolean, Column, DateTime, Float, ForeignKey, Integer, LargeBinary, PickleType, String, Table
4+
from sqlalchemy import (
5+
Boolean, Column, DateTime, Float, ForeignKey, Integer, LargeBinary,
6+
PickleType, String, Table,
7+
)
58
from sqlalchemy.orm import relationship
69

710
from eve_sqlalchemy.declarative import BaseModel

0 commit comments

Comments
 (0)