Skip to content

Commit 939b33d

Browse files
author
Daniel Goshev
committed
Resolve mypy errors.
1 parent 66430ab commit 939b33d

File tree

14 files changed

+194
-406
lines changed

14 files changed

+194
-406
lines changed

‎.github/workflows/django.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,8 @@ jobs:
4646
key: python-${{ hashFiles('requirements/local.txt') }}-${{ hashFiles('requirements/base.txt') }}
4747
- name: Install dependencies
4848
run: pip install -r requirements/local.txt
49-
- name: Run isort
50-
uses: isort/isort-action@master
51-
- name: Run black
52-
uses: psf/black@stable
53-
- name: Run flake8
54-
run: flake8
49+
- name: Run ruff
50+
uses: chartboost/ruff-action@v1
5551
- name: Type check
5652
run: mypy --config mypy.ini styleguide_example/
5753
- name: Run tests

‎pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[tool.ruff]
22
# Exclude a variety of commonly ignored directories.
33
exclude = [
4+
"migrations",
45
".bzr",
56
".direnv",
67
".eggs",
@@ -33,8 +34,8 @@ exclude = [
3334
line-length = 88
3435
indent-width = 4
3536

36-
# Assume Python 3.8
37-
target-version = "py38"
37+
# Assume Python 3.12
38+
target-version = "py312"
3839

3940
[tool.ruff.lint]
4041
# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`) codes by default.

‎styleguide_example/blog_examples/migrations/0001_initial.py

Lines changed: 20 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,47 @@
11
# Generated by Django 4.1.3 on 2023-01-28 14:23
22

3-
import django.utils.timezone
43
from django.db import migrations, models
4+
import django.utils.timezone
55

66

77
class Migration(migrations.Migration):
8+
89
initial = True
910

10-
dependencies = []
11+
dependencies = [
12+
]
1113

1214
operations = [
1315
migrations.CreateModel(
14-
name="TimestampsOpinionated",
16+
name='TimestampsOpinionated',
1517
fields=[
16-
(
17-
"id",
18-
models.BigAutoField(
19-
auto_created=True,
20-
primary_key=True,
21-
serialize=False,
22-
verbose_name="ID",
23-
),
24-
),
25-
("created_at", models.DateTimeField(default=django.utils.timezone.now)),
26-
("updated_at", models.DateTimeField(blank=True, null=True)),
18+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
19+
('created_at', models.DateTimeField(default=django.utils.timezone.now)),
20+
('updated_at', models.DateTimeField(blank=True, null=True)),
2721
],
2822
),
2923
migrations.CreateModel(
30-
name="TimestampsWithAuto",
24+
name='TimestampsWithAuto',
3125
fields=[
32-
(
33-
"id",
34-
models.BigAutoField(
35-
auto_created=True,
36-
primary_key=True,
37-
serialize=False,
38-
verbose_name="ID",
39-
),
40-
),
41-
("created_at", models.DateTimeField(auto_now_add=True)),
42-
("updated_at", models.DateTimeField(auto_now=True)),
26+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
27+
('created_at', models.DateTimeField(auto_now_add=True)),
28+
('updated_at', models.DateTimeField(auto_now=True)),
4329
],
4430
),
4531
migrations.CreateModel(
46-
name="TimestampsWithAutoAndDefault",
32+
name='TimestampsWithAutoAndDefault',
4733
fields=[
48-
(
49-
"id",
50-
models.BigAutoField(
51-
auto_created=True,
52-
primary_key=True,
53-
serialize=False,
54-
verbose_name="ID",
55-
),
56-
),
57-
("created_at", models.DateTimeField(default=django.utils.timezone.now)),
58-
("updated_at", models.DateTimeField(auto_now=True)),
34+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
35+
('created_at', models.DateTimeField(default=django.utils.timezone.now)),
36+
('updated_at', models.DateTimeField(auto_now=True)),
5937
],
6038
),
6139
migrations.CreateModel(
62-
name="TimestampsWithDefault",
40+
name='TimestampsWithDefault',
6341
fields=[
64-
(
65-
"id",
66-
models.BigAutoField(
67-
auto_created=True,
68-
primary_key=True,
69-
serialize=False,
70-
verbose_name="ID",
71-
),
72-
),
73-
("created_at", models.DateTimeField(default=django.utils.timezone.now)),
74-
("updated_at", models.DateTimeField(default=django.utils.timezone.now)),
42+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
43+
('created_at', models.DateTimeField(default=django.utils.timezone.now)),
44+
('updated_at', models.DateTimeField(default=django.utils.timezone.now)),
7545
],
7646
),
7747
]

‎styleguide_example/blog_examples/migrations/0003_usertwofactorauthdata.py

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,25 @@
11
# Generated by Django 4.1.9 on 2023-07-05 08:49
22

3-
import django.db.models.deletion
43
from django.conf import settings
54
from django.db import migrations, models
5+
import django.db.models.deletion
66

77

88
class Migration(migrations.Migration):
9+
910
dependencies = [
1011
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
11-
("blog_examples", "0002_somedatamodel"),
12+
('blog_examples', '0002_somedatamodel'),
1213
]
1314

1415
operations = [
1516
migrations.CreateModel(
16-
name="UserTwoFactorAuthData",
17+
name='UserTwoFactorAuthData',
1718
fields=[
18-
(
19-
"id",
20-
models.BigAutoField(
21-
auto_created=True,
22-
primary_key=True,
23-
serialize=False,
24-
verbose_name="ID",
25-
),
26-
),
27-
("otp_secret", models.CharField(max_length=255)),
28-
("session_identifier", models.UUIDField(blank=True, null=True)),
29-
(
30-
"user",
31-
models.OneToOneField(
32-
on_delete=django.db.models.deletion.CASCADE,
33-
related_name="two_factor_auth_data",
34-
to=settings.AUTH_USER_MODEL,
35-
),
36-
),
19+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
20+
('otp_secret', models.CharField(max_length=255)),
21+
('session_identifier', models.UUIDField(blank=True, null=True)),
22+
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='two_factor_auth_data', to=settings.AUTH_USER_MODEL)),
3723
],
3824
),
3925
]

‎styleguide_example/common/migrations/0001_initial.py

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,30 @@
11
# Generated by Django 3.1.12 on 2021-09-19 13:25
22

3+
from django.db import migrations, models
34
import django.db.models.expressions
45
import django.utils.timezone
5-
from django.db import migrations, models
66

77

88
class Migration(migrations.Migration):
9+
910
initial = True
1011

11-
dependencies = []
12+
dependencies = [
13+
]
1214

1315
operations = [
1416
migrations.CreateModel(
15-
name="RandomModel",
17+
name='RandomModel',
1618
fields=[
17-
(
18-
"id",
19-
models.AutoField(
20-
auto_created=True,
21-
primary_key=True,
22-
serialize=False,
23-
verbose_name="ID",
24-
),
25-
),
26-
(
27-
"created_at",
28-
models.DateTimeField(
29-
db_index=True, default=django.utils.timezone.now
30-
),
31-
),
32-
("updated_at", models.DateTimeField(auto_now=True)),
33-
("start_date", models.DateField()),
34-
("end_date", models.DateField()),
19+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
20+
('created_at', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
21+
('updated_at', models.DateTimeField(auto_now=True)),
22+
('start_date', models.DateField()),
23+
('end_date', models.DateField()),
3524
],
3625
),
3726
migrations.AddConstraint(
38-
model_name="randommodel",
39-
constraint=models.CheckConstraint(
40-
check=models.Q(
41-
start_date__lt=django.db.models.expressions.F("end_date")
42-
),
43-
name="start_date_before_end_date",
44-
),
27+
model_name='randommodel',
28+
constraint=models.CheckConstraint(check=models.Q(start_date__lt=django.db.models.expressions.F('end_date')), name='start_date_before_end_date'),
4529
),
4630
]

‎styleguide_example/common/migrations/0005_simplemodel_randommodel_simple_objects.py

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,31 @@
11
# Generated by Django 4.1.3 on 2022-11-28 11:58
22

3-
import django.utils.timezone
43
from django.db import migrations, models
4+
import django.utils.timezone
55

66

77
class Migration(migrations.Migration):
8+
89
dependencies = [
9-
("common", "0004_remove_randommodel_start_date_before_end_date_and_more"),
10+
('common', '0004_remove_randommodel_start_date_before_end_date_and_more'),
1011
]
1112

1213
operations = [
1314
migrations.CreateModel(
14-
name="SimpleModel",
15+
name='SimpleModel',
1516
fields=[
16-
(
17-
"id",
18-
models.BigAutoField(
19-
auto_created=True,
20-
primary_key=True,
21-
serialize=False,
22-
verbose_name="ID",
23-
),
24-
),
25-
(
26-
"created_at",
27-
models.DateTimeField(
28-
db_index=True, default=django.utils.timezone.now
29-
),
30-
),
31-
("updated_at", models.DateTimeField(auto_now=True)),
32-
("name", models.CharField(blank=True, max_length=255, null=True)),
17+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
18+
('created_at', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
19+
('updated_at', models.DateTimeField(auto_now=True)),
20+
('name', models.CharField(blank=True, max_length=255, null=True)),
3321
],
3422
options={
35-
"abstract": False,
23+
'abstract': False,
3624
},
3725
),
3826
migrations.AddField(
39-
model_name="randommodel",
40-
name="simple_objects",
41-
field=models.ManyToManyField(
42-
blank=True, related_name="random_objects", to="common.simplemodel"
43-
),
27+
model_name='randommodel',
28+
name='simple_objects',
29+
field=models.ManyToManyField(blank=True, related_name='random_objects', to='common.simplemodel'),
4430
),
4531
]

‎styleguide_example/common/models.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from django.db import models
2-
from django.db.models.query import F, Q
2+
from django.db.models import F, Q
33
from django.utils import timezone
44

55

@@ -29,7 +29,13 @@ class RandomModel(BaseModel):
2929
start_date = models.DateField()
3030
end_date = models.DateField()
3131

32-
simple_objects = models.ManyToManyField(SimpleModel, blank=True, related_name="random_objects")
32+
simple_objects = models.ManyToManyField(
33+
SimpleModel, blank=True, related_name="random_objects"
34+
)
3335

3436
class Meta:
35-
constraints = [models.CheckConstraint(name="start_date_before_end_date", check=Q(start_date__lt=F("end_date")))]
37+
constraints = [
38+
models.CheckConstraint(
39+
name="start_date_before_end_date", check=Q(start_date__lt=F("end_date"))
40+
)
41+
]

‎styleguide_example/emails/migrations/0001_initial.py

Lines changed: 15 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,32 @@
11
# Generated by Django 3.2.13 on 2022-05-17 07:34
22

3-
import django.utils.timezone
43
from django.db import migrations, models
4+
import django.utils.timezone
55

66

77
class Migration(migrations.Migration):
8+
89
initial = True
910

10-
dependencies = []
11+
dependencies = [
12+
]
1113

1214
operations = [
1315
migrations.CreateModel(
14-
name="Email",
16+
name='Email',
1517
fields=[
16-
(
17-
"id",
18-
models.BigAutoField(
19-
auto_created=True,
20-
primary_key=True,
21-
serialize=False,
22-
verbose_name="ID",
23-
),
24-
),
25-
(
26-
"created_at",
27-
models.DateTimeField(
28-
db_index=True, default=django.utils.timezone.now
29-
),
30-
),
31-
("updated_at", models.DateTimeField(auto_now=True)),
32-
(
33-
"status",
34-
models.CharField(
35-
choices=[
36-
("READY", "Ready"),
37-
("SENDING", "Sending"),
38-
("SENT", "Sent"),
39-
("FAILED", "Failed"),
40-
],
41-
db_index=True,
42-
default="READY",
43-
max_length=255,
44-
),
45-
),
46-
("to", models.EmailField(max_length=254)),
47-
("subject", models.CharField(max_length=255)),
48-
("html", models.TextField()),
49-
("plain_text", models.TextField()),
50-
("sent_at", models.DateTimeField(blank=True, null=True)),
18+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
19+
('created_at', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
20+
('updated_at', models.DateTimeField(auto_now=True)),
21+
('status', models.CharField(choices=[('READY', 'Ready'), ('SENDING', 'Sending'), ('SENT', 'Sent'), ('FAILED', 'Failed')], db_index=True, default='READY', max_length=255)),
22+
('to', models.EmailField(max_length=254)),
23+
('subject', models.CharField(max_length=255)),
24+
('html', models.TextField()),
25+
('plain_text', models.TextField()),
26+
('sent_at', models.DateTimeField(blank=True, null=True)),
5127
],
5228
options={
53-
"abstract": False,
29+
'abstract': False,
5430
},
5531
),
5632
]

0 commit comments

Comments
 (0)