Skip to content

Commit 689cc4e

Browse files
committed
add flake8 config
1 parent 7f466a1 commit 689cc4e

File tree

87 files changed

+1013
-330
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1013
-330
lines changed

.flake8

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[flake8]
2+
ignore = E203, E266, E501, W503, F403, F401
3+
max-line-length = 79
4+
max-complexity = 18
5+
select = B,C,E,F,W,T4,B9

piccolo/apps/asgi/commands/new.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ def print_instruction(message: str):
1818

1919

2020
def get_options_string(options: t.List[str]):
21-
return ", ".join([f"{name} [{index}]" for index, name in enumerate(options)])
21+
return ", ".join(
22+
[f"{name} [{index}]" for index, name in enumerate(options)]
23+
)
2224

2325

2426
def get_routing_framework() -> str:
@@ -98,11 +100,15 @@ def new(root: str = ".", name: str = "piccolo_project"):
98100
print(f"Problem processing {output_file_name}")
99101
raise exception
100102

101-
with open(os.path.join(output_dir_path, output_file_name), "w") as f:
103+
with open(
104+
os.path.join(output_dir_path, output_file_name), "w"
105+
) as f:
102106
f.write(output_contents)
103107
else:
104108
if file_name.endswith(".jinja_raw"):
105-
output_file_name = file_name.replace(".jinja_raw", ".jinja")
109+
output_file_name = file_name.replace(
110+
".jinja_raw", ".jinja"
111+
)
106112
else:
107113
output_file_name = file_name
108114

@@ -112,5 +118,6 @@ def new(root: str = ".", name: str = "piccolo_project"):
112118
)
113119

114120
print(
115-
"Run `pip install -r requirements.txt` and `python main.py` to get " "started."
121+
"Run `pip install -r requirements.txt` and `python main.py` to get "
122+
"started."
116123
)

piccolo/apps/migrations/auto/diffable_table.py

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
import typing as t
44
from dataclasses import dataclass, field
55

6-
from piccolo.apps.migrations.auto.operations import AddColumn, AlterColumn, DropColumn
6+
from piccolo.apps.migrations.auto.operations import (
7+
AddColumn,
8+
AlterColumn,
9+
DropColumn,
10+
)
711
from piccolo.apps.migrations.auto.serialisation import (
812
deserialise_params,
913
serialise_params,
@@ -65,14 +69,20 @@ class DiffableTable:
6569
previous_class_name: t.Optional[str] = None
6670

6771
def __post_init__(self):
68-
self.columns_map: t.Dict[str, Column] = {i._meta.name: i for i in self.columns}
72+
self.columns_map: t.Dict[str, Column] = {
73+
i._meta.name: i for i in self.columns
74+
}
6975

7076
def __sub__(self, value: DiffableTable) -> TableDelta:
7177
if not isinstance(value, DiffableTable):
72-
raise ValueError("Can only diff with other DiffableTable instances")
78+
raise ValueError(
79+
"Can only diff with other DiffableTable instances"
80+
)
7381

7482
if value.class_name != self.class_name:
75-
raise ValueError("The two tables don't appear to have the same name.")
83+
raise ValueError(
84+
"The two tables don't appear to have the same name."
85+
)
7686

7787
add_columns = [
7888
AddColumn(
@@ -114,7 +124,8 @@ def __sub__(self, value: DiffableTable) -> TableDelta:
114124
)
115125

116126
old_params = {
117-
key: existing_column._meta.params.get(key) for key, _ in delta.items()
127+
key: existing_column._meta.params.get(key)
128+
for key, _ in delta.items()
118129
}
119130

120131
if delta or (column.__class__ != existing_column.__class__):
@@ -162,7 +173,9 @@ def to_table_class(self) -> t.Type[Table]:
162173
_Table: t.Type[Table] = create_table_class(
163174
class_name=self.class_name,
164175
class_kwargs={"tablename": self.tablename},
165-
class_members={column._meta.name: column for column in self.columns},
176+
class_members={
177+
column._meta.name: column for column in self.columns
178+
},
166179
)
167180

168181
return _Table

piccolo/apps/migrations/auto/migration_manager.py

Lines changed: 94 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,22 @@ class AddColumnCollection:
3131
def append(self, add_column: AddColumnClass):
3232
self.add_columns.append(add_column)
3333

34-
def for_table_class_name(self, table_class_name: str) -> t.List[AddColumnClass]:
35-
return [i for i in self.add_columns if i.table_class_name == table_class_name]
34+
def for_table_class_name(
35+
self, table_class_name: str
36+
) -> t.List[AddColumnClass]:
37+
return [
38+
i
39+
for i in self.add_columns
40+
if i.table_class_name == table_class_name
41+
]
3642

37-
def columns_for_table_class_name(self, table_class_name: str) -> t.List[Column]:
43+
def columns_for_table_class_name(
44+
self, table_class_name: str
45+
) -> t.List[Column]:
3846
return [
39-
i.column for i in self.add_columns if i.table_class_name == table_class_name
47+
i.column
48+
for i in self.add_columns
49+
if i.table_class_name == table_class_name
4050
]
4151

4252
@property
@@ -51,8 +61,14 @@ class DropColumnCollection:
5161
def append(self, drop_column: DropColumn):
5262
self.drop_columns.append(drop_column)
5363

54-
def for_table_class_name(self, table_class_name: str) -> t.List[DropColumn]:
55-
return [i for i in self.drop_columns if i.table_class_name == table_class_name]
64+
def for_table_class_name(
65+
self, table_class_name: str
66+
) -> t.List[DropColumn]:
67+
return [
68+
i
69+
for i in self.drop_columns
70+
if i.table_class_name == table_class_name
71+
]
5672

5773
@property
5874
def table_class_names(self) -> t.List[str]:
@@ -66,9 +82,13 @@ class RenameColumnCollection:
6682
def append(self, rename_column: RenameColumn):
6783
self.rename_columns.append(rename_column)
6884

69-
def for_table_class_name(self, table_class_name: str) -> t.List[RenameColumn]:
85+
def for_table_class_name(
86+
self, table_class_name: str
87+
) -> t.List[RenameColumn]:
7088
return [
71-
i for i in self.rename_columns if i.table_class_name == table_class_name
89+
i
90+
for i in self.rename_columns
91+
if i.table_class_name == table_class_name
7292
]
7393

7494
@property
@@ -83,8 +103,14 @@ class AlterColumnCollection:
83103
def append(self, alter_column: AlterColumn):
84104
self.alter_columns.append(alter_column)
85105

86-
def for_table_class_name(self, table_class_name: str) -> t.List[AlterColumn]:
87-
return [i for i in self.alter_columns if i.table_class_name == table_class_name]
106+
def for_table_class_name(
107+
self, table_class_name: str
108+
) -> t.List[AlterColumn]:
109+
return [
110+
i
111+
for i in self.alter_columns
112+
if i.table_class_name == table_class_name
113+
]
88114

89115
@property
90116
def table_class_names(self) -> t.List[str]:
@@ -103,12 +129,18 @@ class MigrationManager:
103129
add_tables: t.List[DiffableTable] = field(default_factory=list)
104130
drop_tables: t.List[DiffableTable] = field(default_factory=list)
105131
rename_tables: t.List[RenameTable] = field(default_factory=list)
106-
add_columns: AddColumnCollection = field(default_factory=AddColumnCollection)
107-
drop_columns: DropColumnCollection = field(default_factory=DropColumnCollection)
132+
add_columns: AddColumnCollection = field(
133+
default_factory=AddColumnCollection
134+
)
135+
drop_columns: DropColumnCollection = field(
136+
default_factory=DropColumnCollection
137+
)
108138
rename_columns: RenameColumnCollection = field(
109139
default_factory=RenameColumnCollection
110140
)
111-
alter_columns: AlterColumnCollection = field(default_factory=AlterColumnCollection)
141+
alter_columns: AlterColumnCollection = field(
142+
default_factory=AlterColumnCollection
143+
)
112144
raw: t.List[t.Union[t.Callable, t.Coroutine]] = field(default_factory=list)
113145
raw_backwards: t.List[t.Union[t.Callable, t.Coroutine]] = field(
114146
default_factory=list
@@ -124,7 +156,9 @@ def add_table(
124156
columns = []
125157

126158
self.add_tables.append(
127-
DiffableTable(class_name=class_name, tablename=tablename, columns=columns)
159+
DiffableTable(
160+
class_name=class_name, tablename=tablename, columns=columns
161+
)
128162
)
129163

130164
def drop_table(self, class_name: str, tablename: str):
@@ -185,7 +219,9 @@ def add_column(
185219
)
186220
)
187221

188-
def drop_column(self, table_class_name: str, tablename: str, column_name: str):
222+
def drop_column(
223+
self, table_class_name: str, tablename: str, column_name: str
224+
):
189225
self.drop_columns.append(
190226
DropColumn(
191227
table_class_name=table_class_name,
@@ -287,7 +323,9 @@ async def get_table_from_snaphot(
287323

288324
async def _run_alter_columns(self, backwards=False):
289325
for table_class_name in self.alter_columns.table_class_names:
290-
alter_columns = self.alter_columns.for_table_class_name(table_class_name)
326+
alter_columns = self.alter_columns.for_table_class_name(
327+
table_class_name
328+
)
291329

292330
if not alter_columns:
293331
continue
@@ -299,10 +337,16 @@ async def _run_alter_columns(self, backwards=False):
299337

300338
for alter_column in alter_columns:
301339

302-
params = alter_column.old_params if backwards else alter_column.params
340+
params = (
341+
alter_column.old_params
342+
if backwards
343+
else alter_column.params
344+
)
303345

304346
old_params = (
305-
alter_column.params if backwards else alter_column.old_params
347+
alter_column.params
348+
if backwards
349+
else alter_column.old_params
306350
)
307351

308352
###############################################################
@@ -319,7 +363,9 @@ async def _run_alter_columns(self, backwards=False):
319363
else alter_column.old_column_class
320364
)
321365

322-
if (old_column_class is not None) and (column_class is not None):
366+
if (old_column_class is not None) and (
367+
column_class is not None
368+
):
323369
if old_column_class != column_class:
324370
old_column = old_column_class(**old_params)
325371
old_column._meta._table = _Table
@@ -356,7 +402,9 @@ async def _run_alter_columns(self, backwards=False):
356402
column = Column()
357403
column._meta._table = _Table
358404
column._meta._name = column_name
359-
await _Table.alter().set_unique(column=column, boolean=unique).run()
405+
await _Table.alter().set_unique(
406+
column=column, boolean=unique
407+
).run()
360408

361409
index = params.get("index")
362410
index_method = params.get("index_method")
@@ -379,7 +427,9 @@ async def _run_alter_columns(self, backwards=False):
379427
column._meta._table = _Table
380428
column._meta._name = column_name
381429
if index is True:
382-
kwargs = {"method": index_method} if index_method else {}
430+
kwargs = (
431+
{"method": index_method} if index_method else {}
432+
)
383433
await _Table.create_index(
384434
[column], if_not_exists=True, **kwargs
385435
).run()
@@ -419,7 +469,9 @@ async def _run_drop_tables(self, backwards=False):
419469
await _Table.create_table().run()
420470
else:
421471
for diffable_table in self.drop_tables:
422-
await (diffable_table.to_table_class().alter().drop_table().run())
472+
await (
473+
diffable_table.to_table_class().alter().drop_table().run()
474+
)
423475

424476
async def _run_drop_columns(self, backwards=False):
425477
if backwards:
@@ -437,7 +489,9 @@ async def _run_drop_columns(self, backwards=False):
437489
).run()
438490
else:
439491
for table_class_name in self.drop_columns.table_class_names:
440-
columns = self.drop_columns.for_table_class_name(table_class_name)
492+
columns = self.drop_columns.for_table_class_name(
493+
table_class_name
494+
)
441495

442496
if not columns:
443497
continue
@@ -448,7 +502,9 @@ async def _run_drop_columns(self, backwards=False):
448502
)
449503

450504
for column in columns:
451-
await _Table.alter().drop_column(column=column.column_name).run()
505+
await _Table.alter().drop_column(
506+
column=column.column_name
507+
).run()
452508

453509
async def _run_rename_tables(self, backwards=False):
454510
for rename_table in self.rename_tables:
@@ -458,10 +514,14 @@ async def _run_rename_tables(self, backwards=False):
458514
else rename_table.old_class_name
459515
)
460516
tablename = (
461-
rename_table.new_tablename if backwards else rename_table.old_tablename
517+
rename_table.new_tablename
518+
if backwards
519+
else rename_table.old_tablename
462520
)
463521
new_tablename = (
464-
rename_table.old_tablename if backwards else rename_table.new_tablename
522+
rename_table.old_tablename
523+
if backwards
524+
else rename_table.new_tablename
465525
)
466526

467527
_Table: t.Type[Table] = create_table_class(
@@ -472,7 +532,9 @@ async def _run_rename_tables(self, backwards=False):
472532

473533
async def _run_rename_columns(self, backwards=False):
474534
for table_class_name in self.rename_columns.table_class_names:
475-
columns = self.rename_columns.for_table_class_name(table_class_name)
535+
columns = self.rename_columns.for_table_class_name(
536+
table_class_name
537+
)
476538

477539
if not columns:
478540
continue
@@ -502,14 +564,17 @@ async def _run_rename_columns(self, backwards=False):
502564
async def _run_add_tables(self, backwards=False):
503565
if backwards:
504566
for add_table in self.add_tables:
505-
await add_table.to_table_class().alter().drop_table(cascade=True).run()
567+
await add_table.to_table_class().alter().drop_table(
568+
cascade=True
569+
).run()
506570
else:
507571
for add_table in self.add_tables:
508572
_Table: t.Type[Table] = create_table_class(
509573
class_name=add_table.class_name,
510574
class_kwargs={"tablename": add_table.tablename},
511575
class_members={
512-
column._meta.name: column for column in add_table.columns
576+
column._meta.name: column
577+
for column in add_table.columns
513578
},
514579
)
515580

0 commit comments

Comments
 (0)