Skip to content

Commit 89ac596

Browse files
ryankwondevryankwondev
committed
⬆️ Update ruff from 0.2.0 to 0.4.1 and fix deprecated scripts commands
1 parent 6151f23 commit 89ac596

File tree

7 files changed

+40
-77
lines changed

7 files changed

+40
-77
lines changed

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ cairosvg = "^2.5.2"
4747
mdx-include = "^1.4.1"
4848
coverage = {extras = ["toml"], version = ">=6.2,<8.0"}
4949
fastapi = "^0.103.2"
50-
ruff = "0.2.0"
50+
ruff = "0.4.1"
5151
# For FastAPI tests
5252
httpx = "0.24.1"
5353
# TODO: upgrade when deprecating Python 3.7

‎scripts/format.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh -e
22
set -x
33

4-
ruff sqlmodel tests docs_src scripts --fix
4+
ruff check sqlmodel tests docs_src scripts --fix
55
ruff format sqlmodel tests docs_src scripts

‎scripts/lint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ set -e
44
set -x
55

66
mypy sqlmodel
7-
ruff sqlmodel tests docs_src scripts
7+
ruff check sqlmodel tests docs_src scripts
88
ruff format sqlmodel tests docs_src --check

‎sqlmodel/ext/asyncio/session.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ async def exec(
4343
bind_arguments: Optional[Dict[str, Any]] = None,
4444
_parent_execute_state: Optional[Any] = None,
4545
_add_event: Optional[Any] = None,
46-
) -> TupleResult[_TSelectParam]:
47-
...
46+
) -> TupleResult[_TSelectParam]: ...
4847

4948
@overload
5049
async def exec(
@@ -56,8 +55,7 @@ async def exec(
5655
bind_arguments: Optional[Dict[str, Any]] = None,
5756
_parent_execute_state: Optional[Any] = None,
5857
_add_event: Optional[Any] = None,
59-
) -> ScalarResult[_TSelectParam]:
60-
...
58+
) -> ScalarResult[_TSelectParam]: ...
6159

6260
async def exec(
6361
self,

‎sqlmodel/main.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,7 @@ def Field(
223223
sa_column_args: Union[Sequence[Any], UndefinedType] = Undefined,
224224
sa_column_kwargs: Union[Mapping[str, Any], UndefinedType] = Undefined,
225225
schema_extra: Optional[Dict[str, Any]] = None,
226-
) -> Any:
227-
...
226+
) -> Any: ...
228227

229228

230229
@overload
@@ -260,8 +259,7 @@ def Field(
260259
repr: bool = True,
261260
sa_column: Union[Column, UndefinedType] = Undefined, # type: ignore
262261
schema_extra: Optional[Dict[str, Any]] = None,
263-
) -> Any:
264-
...
262+
) -> Any: ...
265263

266264

267265
def Field(
@@ -353,8 +351,7 @@ def Relationship(
353351
link_model: Optional[Any] = None,
354352
sa_relationship_args: Optional[Sequence[Any]] = None,
355353
sa_relationship_kwargs: Optional[Mapping[str, Any]] = None,
356-
) -> Any:
357-
...
354+
) -> Any: ...
358355

359356

360357
@overload
@@ -363,8 +360,7 @@ def Relationship(
363360
back_populates: Optional[str] = None,
364361
link_model: Optional[Any] = None,
365362
sa_relationship: Optional[RelationshipProperty[Any]] = None,
366-
) -> Any:
367-
...
363+
) -> Any: ...
368364

369365

370366
def Relationship(

‎sqlmodel/orm/session.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ def exec(
3535
bind_arguments: Optional[Dict[str, Any]] = None,
3636
_parent_execute_state: Optional[Any] = None,
3737
_add_event: Optional[Any] = None,
38-
) -> TupleResult[_TSelectParam]:
39-
...
38+
) -> TupleResult[_TSelectParam]: ...
4039

4140
@overload
4241
def exec(
@@ -48,8 +47,7 @@ def exec(
4847
bind_arguments: Optional[Dict[str, Any]] = None,
4948
_parent_execute_state: Optional[Any] = None,
5049
_add_event: Optional[Any] = None,
51-
) -> ScalarResult[_TSelectParam]:
52-
...
50+
) -> ScalarResult[_TSelectParam]: ...
5351

5452
def exec(
5553
self,

‎sqlmodel/sql/expression.py‎

Lines changed: 29 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,7 @@ class SelectOfScalar(SelectBase[_T]):
328328

329329

330330
@overload
331-
def select(__ent0: _TCCA[_T0]) -> SelectOfScalar[_T0]:
332-
...
331+
def select(__ent0: _TCCA[_T0]) -> SelectOfScalar[_T0]: ...
333332

334333

335334
@overload
@@ -344,104 +343,92 @@ def select(__ent0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: # type: ignore
344343
def select( # type: ignore
345344
__ent0: _TCCA[_T0],
346345
__ent1: _TCCA[_T1],
347-
) -> Select[Tuple[_T0, _T1]]:
348-
...
346+
) -> Select[Tuple[_T0, _T1]]: ...
349347

350348

351349
@overload
352350
def select( # type: ignore
353351
__ent0: _TCCA[_T0],
354352
entity_1: _TScalar_1,
355-
) -> Select[Tuple[_T0, _TScalar_1]]:
356-
...
353+
) -> Select[Tuple[_T0, _TScalar_1]]: ...
357354

358355

359356
@overload
360357
def select( # type: ignore
361358
entity_0: _TScalar_0,
362359
__ent1: _TCCA[_T1],
363-
) -> Select[Tuple[_TScalar_0, _T1]]:
364-
...
360+
) -> Select[Tuple[_TScalar_0, _T1]]: ...
365361

366362

367363
@overload
368364
def select( # type: ignore
369365
entity_0: _TScalar_0,
370366
entity_1: _TScalar_1,
371-
) -> Select[Tuple[_TScalar_0, _TScalar_1]]:
372-
...
367+
) -> Select[Tuple[_TScalar_0, _TScalar_1]]: ...
373368

374369

375370
@overload
376371
def select( # type: ignore
377372
__ent0: _TCCA[_T0],
378373
__ent1: _TCCA[_T1],
379374
__ent2: _TCCA[_T2],
380-
) -> Select[Tuple[_T0, _T1, _T2]]:
381-
...
375+
) -> Select[Tuple[_T0, _T1, _T2]]: ...
382376

383377

384378
@overload
385379
def select( # type: ignore
386380
__ent0: _TCCA[_T0],
387381
__ent1: _TCCA[_T1],
388382
entity_2: _TScalar_2,
389-
) -> Select[Tuple[_T0, _T1, _TScalar_2]]:
390-
...
383+
) -> Select[Tuple[_T0, _T1, _TScalar_2]]: ...
391384

392385

393386
@overload
394387
def select( # type: ignore
395388
__ent0: _TCCA[_T0],
396389
entity_1: _TScalar_1,
397390
__ent2: _TCCA[_T2],
398-
) -> Select[Tuple[_T0, _TScalar_1, _T2]]:
399-
...
391+
) -> Select[Tuple[_T0, _TScalar_1, _T2]]: ...
400392

401393

402394
@overload
403395
def select( # type: ignore
404396
__ent0: _TCCA[_T0],
405397
entity_1: _TScalar_1,
406398
entity_2: _TScalar_2,
407-
) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2]]:
408-
...
399+
) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2]]: ...
409400

410401

411402
@overload
412403
def select( # type: ignore
413404
entity_0: _TScalar_0,
414405
__ent1: _TCCA[_T1],
415406
__ent2: _TCCA[_T2],
416-
) -> Select[Tuple[_TScalar_0, _T1, _T2]]:
417-
...
407+
) -> Select[Tuple[_TScalar_0, _T1, _T2]]: ...
418408

419409

420410
@overload
421411
def select( # type: ignore
422412
entity_0: _TScalar_0,
423413
__ent1: _TCCA[_T1],
424414
entity_2: _TScalar_2,
425-
) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2]]:
426-
...
415+
) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2]]: ...
427416

428417

429418
@overload
430419
def select( # type: ignore
431420
entity_0: _TScalar_0,
432421
entity_1: _TScalar_1,
433422
__ent2: _TCCA[_T2],
434-
) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2]]:
435-
...
423+
) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2]]: ...
436424

437425

438426
@overload
439427
def select( # type: ignore
440428
entity_0: _TScalar_0,
441429
entity_1: _TScalar_1,
442430
entity_2: _TScalar_2,
443-
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2]]:
444-
...
431+
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2]]: ...
445432

446433

447434
@overload
@@ -450,8 +437,7 @@ def select( # type: ignore
450437
__ent1: _TCCA[_T1],
451438
__ent2: _TCCA[_T2],
452439
__ent3: _TCCA[_T3],
453-
) -> Select[Tuple[_T0, _T1, _T2, _T3]]:
454-
...
440+
) -> Select[Tuple[_T0, _T1, _T2, _T3]]: ...
455441

456442

457443
@overload
@@ -460,8 +446,7 @@ def select( # type: ignore
460446
__ent1: _TCCA[_T1],
461447
__ent2: _TCCA[_T2],
462448
entity_3: _TScalar_3,
463-
) -> Select[Tuple[_T0, _T1, _T2, _TScalar_3]]:
464-
...
449+
) -> Select[Tuple[_T0, _T1, _T2, _TScalar_3]]: ...
465450

466451

467452
@overload
@@ -470,8 +455,7 @@ def select( # type: ignore
470455
__ent1: _TCCA[_T1],
471456
entity_2: _TScalar_2,
472457
__ent3: _TCCA[_T3],
473-
) -> Select[Tuple[_T0, _T1, _TScalar_2, _T3]]:
474-
...
458+
) -> Select[Tuple[_T0, _T1, _TScalar_2, _T3]]: ...
475459

476460

477461
@overload
@@ -480,8 +464,7 @@ def select( # type: ignore
480464
__ent1: _TCCA[_T1],
481465
entity_2: _TScalar_2,
482466
entity_3: _TScalar_3,
483-
) -> Select[Tuple[_T0, _T1, _TScalar_2, _TScalar_3]]:
484-
...
467+
) -> Select[Tuple[_T0, _T1, _TScalar_2, _TScalar_3]]: ...
485468

486469

487470
@overload
@@ -490,8 +473,7 @@ def select( # type: ignore
490473
entity_1: _TScalar_1,
491474
__ent2: _TCCA[_T2],
492475
__ent3: _TCCA[_T3],
493-
) -> Select[Tuple[_T0, _TScalar_1, _T2, _T3]]:
494-
...
476+
) -> Select[Tuple[_T0, _TScalar_1, _T2, _T3]]: ...
495477

496478

497479
@overload
@@ -500,8 +482,7 @@ def select( # type: ignore
500482
entity_1: _TScalar_1,
501483
__ent2: _TCCA[_T2],
502484
entity_3: _TScalar_3,
503-
) -> Select[Tuple[_T0, _TScalar_1, _T2, _TScalar_3]]:
504-
...
485+
) -> Select[Tuple[_T0, _TScalar_1, _T2, _TScalar_3]]: ...
505486

506487

507488
@overload
@@ -510,8 +491,7 @@ def select( # type: ignore
510491
entity_1: _TScalar_1,
511492
entity_2: _TScalar_2,
512493
__ent3: _TCCA[_T3],
513-
) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2, _T3]]:
514-
...
494+
) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2, _T3]]: ...
515495

516496

517497
@overload
@@ -520,8 +500,7 @@ def select( # type: ignore
520500
entity_1: _TScalar_1,
521501
entity_2: _TScalar_2,
522502
entity_3: _TScalar_3,
523-
) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2, _TScalar_3]]:
524-
...
503+
) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2, _TScalar_3]]: ...
525504

526505

527506
@overload
@@ -530,8 +509,7 @@ def select( # type: ignore
530509
__ent1: _TCCA[_T1],
531510
__ent2: _TCCA[_T2],
532511
__ent3: _TCCA[_T3],
533-
) -> Select[Tuple[_TScalar_0, _T1, _T2, _T3]]:
534-
...
512+
) -> Select[Tuple[_TScalar_0, _T1, _T2, _T3]]: ...
535513

536514

537515
@overload
@@ -540,8 +518,7 @@ def select( # type: ignore
540518
__ent1: _TCCA[_T1],
541519
__ent2: _TCCA[_T2],
542520
entity_3: _TScalar_3,
543-
) -> Select[Tuple[_TScalar_0, _T1, _T2, _TScalar_3]]:
544-
...
521+
) -> Select[Tuple[_TScalar_0, _T1, _T2, _TScalar_3]]: ...
545522

546523

547524
@overload
@@ -550,8 +527,7 @@ def select( # type: ignore
550527
__ent1: _TCCA[_T1],
551528
entity_2: _TScalar_2,
552529
__ent3: _TCCA[_T3],
553-
) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2, _T3]]:
554-
...
530+
) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2, _T3]]: ...
555531

556532

557533
@overload
@@ -560,8 +536,7 @@ def select( # type: ignore
560536
__ent1: _TCCA[_T1],
561537
entity_2: _TScalar_2,
562538
entity_3: _TScalar_3,
563-
) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2, _TScalar_3]]:
564-
...
539+
) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2, _TScalar_3]]: ...
565540

566541

567542
@overload
@@ -570,8 +545,7 @@ def select( # type: ignore
570545
entity_1: _TScalar_1,
571546
__ent2: _TCCA[_T2],
572547
__ent3: _TCCA[_T3],
573-
) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2, _T3]]:
574-
...
548+
) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2, _T3]]: ...
575549

576550

577551
@overload
@@ -580,8 +554,7 @@ def select( # type: ignore
580554
entity_1: _TScalar_1,
581555
__ent2: _TCCA[_T2],
582556
entity_3: _TScalar_3,
583-
) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2, _TScalar_3]]:
584-
...
557+
) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2, _TScalar_3]]: ...
585558

586559

587560
@overload
@@ -590,8 +563,7 @@ def select( # type: ignore
590563
entity_1: _TScalar_1,
591564
entity_2: _TScalar_2,
592565
__ent3: _TCCA[_T3],
593-
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _T3]]:
594-
...
566+
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _T3]]: ...
595567

596568

597569
@overload
@@ -600,8 +572,7 @@ def select( # type: ignore
600572
entity_1: _TScalar_1,
601573
entity_2: _TScalar_2,
602574
entity_3: _TScalar_3,
603-
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TScalar_3]]:
604-
...
575+
) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TScalar_3]]: ...
605576

606577

607578
# Generated overloads end

0 commit comments

Comments
 (0)