Use [flake8](https://flake8.pycqa.org/) to lint code.

jayvynl · jayvynl · commit 1d79a49f23f0 · 2023-09-09T20:31:34.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 1.1.2
+- Use [flake8](https://flake8.pycqa.org/) to lint code.
+
 ### 1.1.1
 - [Black](https://github.com/psf/black) code style.
 - Support [MergeTree settings](https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree#settings) in creating table.
diff --git a/clickhouse_backend/__init__.py b/clickhouse_backend/__init__.py
@@ -1,3 +1,3 @@
-VERSION = (1, 1, 1)
+VERSION = (1, 1, 2)
 
 __version__ = ".".join(map(str, VERSION))
diff --git a/clickhouse_backend/backend/creation.py b/clickhouse_backend/backend/creation.py
@@ -1,7 +1,6 @@
 import sys
 
 from clickhouse_driver.errors import ErrorCodes
-from django.conf import settings
 from django.db.backends.base.creation import BaseDatabaseCreation
 from django.db.backends.utils import strip_quotes
 
diff --git a/clickhouse_backend/backend/operations.py b/clickhouse_backend/backend/operations.py
@@ -141,17 +141,17 @@ def unification_cast_sql(self, output_field):
     def date_extract_sql(self, lookup_type, sql, *args):
         # https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/
         if lookup_type == "iso_year":
-            sql = f"toISOYear(%s)" % sql
+            sql = "toISOYear(%s)" % sql
         elif lookup_type == "day":
-            sql = f"toDayOfMonth(%s)" % sql
+            sql = "toDayOfMonth(%s)" % sql
         elif lookup_type == "week":
-            sql = f"toISOWeek(%s)" % sql
+            sql = "toISOWeek(%s)" % sql
         elif lookup_type == "week_day":
-            sql = f"modulo(toDayOfWeek(%s), 7) + 1" % sql
+            sql = "modulo(toDayOfWeek(%s), 7) + 1" % sql
         elif lookup_type == "iso_week_day":
-            sql = f"toDayOfWeek(%s)" % sql
+            sql = "toDayOfWeek(%s)" % sql
         else:
-            sql = f"to%s(%s)" % (lookup_type.capitalize(), sql)
+            sql = "to%s(%s)" % (lookup_type.capitalize(), sql)
         if compat.dj_ge41:
             return sql, args[0]
         else:
diff --git a/clickhouse_backend/models/__init__.py b/clickhouse_backend/models/__init__.py
@@ -1,14 +1,14 @@
 from clickhouse_backend.patch import patch_all
 
 from .base import ClickhouseModel
-from .engines import *
-from .engines import __all__ as engines_all  # NOQA
-from .fields import *
-from .fields import __all__ as fields_all  # NOQA
-from .functions import *
-from .functions import __all__ as fucntions_all  # NOQA
-from .indexes import *
-from .indexes import __all__ as indexes_all  # NOQA
+from .engines import *  # noqa: F401,F403
+from .engines import __all__ as engines_all
+from .fields import *  # noqa: F401,F403
+from .fields import __all__ as fields_all
+from .functions import *  # noqa: F401,F403
+from .functions import __all__ as fucntions_all
+from .indexes import *  # noqa: F401,F403
+from .indexes import __all__ as indexes_all
 
 __all__ = [
     "ClickhouseModel",
diff --git a/clickhouse_backend/models/fields/__init__.py b/clickhouse_backend/models/fields/__init__.py
@@ -9,14 +9,14 @@
 
 from clickhouse_backend.validators import MaxBytesValidator
 
-from .array import *
+from .array import *  # noqa: F403
 from .base import FieldMixin
-from .integer import *
-from .json import *
-from .map import *
-from .tuple import *
+from .integer import *  # noqa: F403
+from .json import *  # noqa: F403
+from .map import *  # noqa: F403
+from .tuple import *  # noqa: F403
 
-__all__ = [
+__all__ = [  # noqa: F405
     "Int8Field",
     "UInt8Field",
     "Int16Field",
diff --git a/clickhouse_backend/patch/__init__.py b/clickhouse_backend/patch/__init__.py
@@ -1,8 +1,8 @@
-from .fields import *
+from .fields import *  # noqa: F403
 from .fields import __all__ as fields_all
-from .functions import *
+from .functions import *  # noqa: F403
 from .functions import __all__ as functions_all
-from .migrations import *
+from .migrations import *  # noqa: F403
 from .migrations import __all__ as migrations_all
 
 __all__ = [
@@ -14,6 +14,6 @@
 
 
 def patch_all():
-    patch_functions()
-    patch_fields()
-    patch_migrations()
+    patch_functions()  # noqa: F405
+    patch_fields()  # noqa: F405
+    patch_migrations()  # noqa: F405
diff --git a/docs/Fields.md b/docs/Fields.md
@@ -52,11 +52,11 @@ Passing `null=True` will make a field [Nullable](https://clickhouse.com/docs/en/
 
 Passing `low_cardinality=True` will make a field [LowCardinality](https://clickhouse.com/docs/en/sql-reference/data-types/lowcardinality).
 
-Name of field class is always concat clickhouse date type name to `Field`.
+Name of field class is always concat clickhouse data type name to `Field`.
 For example, [DateTime64](https://clickhouse.com/docs/en/sql-reference/data-types/datetime64) field is named as `DateTime64Field`.
 All clickhouse fields are imported from `clickhouse_backend.models`
 
-Supported date types are:
+Supported data types are:
 
 - Float32/Float64
 - Int8/Int16/Int32/Int64/Int128/Int256
@@ -82,12 +82,12 @@ Fields importing path: `clickhouse_backend.models.[U]Int(8|16|32|64|128|256)Fiel
 
 For example, UInt8 type is imported from `clickhouse_backend.models.UInt8Field`
 
-Both Nullable and LowCardinality are supported for all int types.
+Both Nullable and LowCardinality are supported for all integer types.
 
 All UInt types will have correct range validators.
 
 For example, `clickhouse_backend.models.UInt16Field` have a range from 0 to 65535.
-As a contrast, `django.db.models.SmallIntegerField` have a range from 0 to 32767, causing half range waisted.
+As a contrast, `django.db.models.PositiveSmallIntegerField` have a range from 0 to 32767, causing half range waisted.
 
 
 ### Float(32|64)
diff --git a/example/testapp/admin.py b/example/testapp/admin.py
@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.
diff --git a/example/testapp/models.py b/example/testapp/models.py
@@ -1,4 +1,4 @@
-from django.db.models import CheckConstraint, Func, IntegerChoices, Q
+from django.db.models import CheckConstraint, IntegerChoices, Q
 from django.utils import timezone
 
 from clickhouse_backend import models
diff --git a/example/testapp/views.py b/example/testapp/views.py
@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.
diff --git a/pyproject.toml b/pyproject.toml
@@ -13,27 +13,27 @@ requires-python = ">=3.7, <4"
 keywords = ["Django", "ClickHouse", "database", "backend", "engine", "driver"]
 license = {text = "MIT"}
 classifiers = [
-        "Framework :: Django",
-        "Framework :: Django :: 3.2",
-        "Framework :: Django :: 4",
-        "Framework :: Django :: 4.0",
-        "Framework :: Django :: 4.1",
-        "Framework :: Django :: 4.2",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: MIT License",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
+    "Framework :: Django",
+    "Framework :: Django :: 3.2",
+    "Framework :: Django :: 4",
+    "Framework :: Django :: 4.0",
+    "Framework :: Django :: 4.1",
+    "Framework :: Django :: 4.2",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
-        "django>=3.2",
-        "clickhouse-driver==0.2.6",
-        "clickhouse-pool==0.5.3",
+    "django>=3.2",
+    "clickhouse-driver==0.2.6",
+    "clickhouse-pool==0.5.3",
 ]
 dynamic = ["version", "readme"]
 
diff --git a/tests/aggregation/test_filter_argument.py b/tests/aggregation/test_filter_argument.py
@@ -1,21 +1,7 @@
 import datetime
 from decimal import Decimal
 
-from django.db.models import (
-    Avg,
-    Case,
-    Count,
-    Exists,
-    F,
-    Max,
-    OuterRef,
-    Q,
-    StdDev,
-    Subquery,
-    Sum,
-    Variance,
-    When,
-)
+from django.db.models import Avg, Case, Count, F, Q, StdDev, Sum, Variance, When
 from django.test import TestCase
 from django.test.utils import Approximate
 
diff --git a/tests/aggregation/tests.py b/tests/aggregation/tests.py
@@ -1,5 +1,4 @@
 import datetime
-import math
 import re
 from decimal import Decimal
 
@@ -18,28 +17,16 @@
     IntegerField,
     Max,
     Min,
-    OuterRef,
     Q,
     StdDev,
-    Subquery,
     Sum,
-    TimeField,
     Value,
     Variance,
     When,
 )
 from django.db.models.expressions import Func, RawSQL
-from django.db.models.functions import (
-    Cast,
-    Coalesce,
-    Greatest,
-    Now,
-    Pi,
-    TruncDate,
-    TruncHour,
-)
+from django.db.models.functions import Cast, Coalesce, Greatest, Now, TruncHour
 from django.test import TestCase
-from django.test.testcases import skipUnlessDBFeature
 from django.test.utils import Approximate, CaptureQueriesContext
 from django.utils import timezone
 
diff --git a/tests/auth_tests/test_auth_backends.py b/tests/auth_tests/test_auth_backends.py
@@ -1,29 +1,19 @@
-import sys
 from datetime import date
 from unittest import mock
 
 from django.contrib.auth import (
     BACKEND_SESSION_KEY,
     SESSION_KEY,
-    _clean_credentials,
     authenticate,
     get_user,
     signals,
 )
 from django.contrib.auth.backends import BaseBackend, ModelBackend
-from django.contrib.auth.hashers import MD5PasswordHasher
 from django.contrib.auth.models import AnonymousUser, Group, Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ImproperlyConfigured, PermissionDenied
 from django.http import HttpRequest
-from django.test import (
-    RequestFactory,
-    SimpleTestCase,
-    TestCase,
-    modify_settings,
-    override_settings,
-)
-from django.views.debug import technical_500_response
+from django.test import SimpleTestCase, TestCase, modify_settings, override_settings
 from django.views.decorators.debug import sensitive_variables
 
 from .models import (
diff --git a/tests/auth_tests/test_middleware.py b/tests/auth_tests/test_middleware.py
@@ -1,6 +1,5 @@
 from django.contrib.auth.middleware import AuthenticationMiddleware
 from django.contrib.auth.models import User
-from django.core.exceptions import ImproperlyConfigured
 from django.http import HttpRequest, HttpResponse
 from django.test import TestCase
 
diff --git a/tests/backends/clickhouse/test_introspection.py b/tests/backends/clickhouse/test_introspection.py
@@ -1,5 +1,3 @@
-import unittest
-
 from django.db import connection
 from django.test import TestCase
 
diff --git a/tests/backends/clickhouse/test_operations.py b/tests/backends/clickhouse/test_operations.py
@@ -1,5 +1,3 @@
-import unittest
-
 from django.core.management.color import no_style
 from django.db import connection
 from django.test import SimpleTestCase
diff --git a/tests/clickhouse_table_engine/test_base.py b/tests/clickhouse_table_engine/test_base.py
@@ -6,7 +6,6 @@
 
 from django.apps import apps
 from django.db import connection, connections, migrations
-from django.db import models
 from django.db import models as django_models
 from django.db.migrations.migration import Migration
 from django.db.migrations.recorder import MigrationRecorder
@@ -357,7 +356,7 @@ def set_up_distributed_model(
                     "pony",
                     models.Index(
                         fields=["pink"],
-                        name=f"pony_pink_idx",
+                        name="pony_pink_idx",
                         type=models.Set(100),
                         granularity=10,
                     ),
@@ -369,7 +368,7 @@ def set_up_distributed_model(
                     "pony",
                     models.Index(
                         fields=["pink", "weight"],
-                        name=f"pony_test_idx",
+                        name="pony_test_idx",
                         type=models.Set(100),
                         granularity=10,
                     ),
diff --git a/tests/migration_test_data_persistence/tests.py b/tests/migration_test_data_persistence/tests.py
@@ -1,4 +1,4 @@
-from django.test import TestCase, TransactionTestCase
+from django.test import TransactionTestCase
 
 from .models import Book
 
diff --git a/tests/migrations/test_autodetector.py b/tests/migrations/test_autodetector.py
@@ -5,13 +5,13 @@
 from django.apps import apps
 from django.conf import settings
 from django.core.validators import RegexValidator, validate_slug
-from django.db import connection, migrations, models
+from django.db import connection, models
 from django.db.migrations.autodetector import MigrationAutodetector
 from django.db.migrations.graph import MigrationGraph
 from django.db.migrations.loader import MigrationLoader
 from django.db.migrations.questioner import MigrationQuestioner
 from django.db.migrations.state import ModelState, ProjectState
-from django.test import SimpleTestCase, TestCase, override_settings
+from django.test import TestCase, override_settings
 from django.test.utils import isolate_lru_cache
 
 from clickhouse_backend import compat
diff --git a/tests/migrations/test_operations.py b/tests/migrations/test_operations.py
@@ -1822,7 +1822,7 @@ def test_rename_field_reloads_state_on_fk_target_changes(self):
         constraint before modifying the column.
         """
         app_label = "alter_rename_field_reloads_state_on_fk_target_changes"
-        project_state = self.apply_operations(
+        self.apply_operations(
             app_label,
             ProjectState(),
             operations=[
diff --git a/tests/migrations/test_writer.py b/tests/migrations/test_writer.py
@@ -13,7 +13,7 @@
 try:
     import zoneinfo
 except ImportError:
-    from backports import zoneinfo
+    from backports import zoneinfo  # noqa: F401
 
 try:
     import pytz
@@ -28,10 +28,9 @@
 from django.db import migrations, models
 from django.db.migrations.serializer import BaseSerializer
 from django.db.migrations.writer import MigrationWriter, OperationWriter
-from django.test import SimpleTestCase, ignore_warnings
+from django.test import SimpleTestCase
 from django.utils.deconstruct import deconstructible
 from django.utils.functional import SimpleLazyObject
-from django.utils.timezone import get_default_timezone, get_fixed_timezone
 from django.utils.translation import gettext_lazy as _
 
 from clickhouse_backend import compat
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-VERSION = (1, 1, 1)`
	`1`	`+VERSION = (1, 1, 2)`
`2`	`2`
`3`	`3`	`__version__ = ".".join(map(str, VERSION))`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +0,0 @@`
`1`		`-from django.contrib import admin`
`2`		`-`
`3`		`-# Register your models here.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from django.db.models import CheckConstraint, Func, IntegerChoices, Q`
	`1`	`+from django.db.models import CheckConstraint, IntegerChoices, Q`
`2`	`2`	`from django.utils import timezone`
`3`	`3`
`4`	`4`	`from clickhouse_backend import models`