From f2eb81371abe7e3815c717ae8874c3551118f2d1 Mon Sep 17 00:00:00 2001
From: olliemath <oliver.margetts@gmail.com>
Date: Tue, 27 Jul 2021 23:18:38 +0100
Subject: [PATCH] Chore: isort

---
 clickhouse_orm/database.py      | 21 ++++++++++-----------
 clickhouse_orm/engines.py       |  2 --
 clickhouse_orm/fields.py        |  2 --
 clickhouse_orm/query.py         |  7 +++----
 clickhouse_orm/system_models.py |  2 --
 clickhouse_orm/utils.py         |  4 ++--
 pyproject.toml                  |  3 +++
 7 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/clickhouse_orm/database.py b/clickhouse_orm/database.py
index 3738b62..ec9407c 100644
--- a/clickhouse_orm/database.py
+++ b/clickhouse_orm/database.py
@@ -1,16 +1,15 @@
-from __future__ import unicode_literals
-
-import re
-import requests
-from collections import namedtuple
-from .models import ModelBase
-from .utils import parse_tsv, import_submodules
-from math import ceil
 import datetime
-from string import Template
-import pytz
-
 import logging
+import re
+from collections import namedtuple
+from math import ceil
+from string import Template
+
+import pytz
+import requests
+
+from .models import ModelBase
+from .utils import import_submodules, parse_tsv
 
 logger = logging.getLogger("clickhouse_orm")
 
diff --git a/clickhouse_orm/engines.py b/clickhouse_orm/engines.py
index 5fef48f..8dfda54 100644
--- a/clickhouse_orm/engines.py
+++ b/clickhouse_orm/engines.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import logging
 
 from .utils import comma_join, get_subclass_names
diff --git a/clickhouse_orm/fields.py b/clickhouse_orm/fields.py
index a890385..31c36eb 100644
--- a/clickhouse_orm/fields.py
+++ b/clickhouse_orm/fields.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 from calendar import timegm
 from decimal import Decimal, localcontext
diff --git a/clickhouse_orm/query.py b/clickhouse_orm/query.py
index d9be1be..885feb1 100644
--- a/clickhouse_orm/query.py
+++ b/clickhouse_orm/query.py
@@ -1,10 +1,9 @@
-from __future__ import unicode_literals
-
-import pytz
 from copy import copy, deepcopy
 from math import ceil
-from .utils import comma_join, string_or_func, arg_to_sql
 
+import pytz
+
+from .utils import arg_to_sql, comma_join, string_or_func
 
 # TODO
 # - check that field names are valid
diff --git a/clickhouse_orm/system_models.py b/clickhouse_orm/system_models.py
index 9028a40..dbd2952 100644
--- a/clickhouse_orm/system_models.py
+++ b/clickhouse_orm/system_models.py
@@ -2,8 +2,6 @@
 This file contains system readonly models that can be got from the database
 https://clickhouse.tech/docs/en/system_tables/
 """
-from __future__ import unicode_literals
-
 from .database import Database
 from .fields import DateTimeField, StringField, UInt8Field, UInt32Field, UInt64Field
 from .models import Model
diff --git a/clickhouse_orm/utils.py b/clickhouse_orm/utils.py
index cf9c67d..8be51f3 100644
--- a/clickhouse_orm/utils.py
+++ b/clickhouse_orm/utils.py
@@ -2,7 +2,7 @@ import codecs
 import importlib
 import pkgutil
 import re
-from datetime import date, datetime, tzinfo, timedelta
+from datetime import date, datetime, timedelta, tzinfo
 
 SPECIAL_CHARS = {"\b": "\\b", "\f": "\\f", "\r": "\\r", "\n": "\\n", "\t": "\\t", "\0": "\\0", "\\": "\\\\", "'": "\\'"}
 
@@ -40,7 +40,7 @@ def arg_to_sql(arg):
     Supports functions, model fields, strings, dates, datetimes, timedeltas, booleans,
     None, numbers, timezones, arrays/iterables.
     """
-    from clickhouse_orm import Field, StringField, DateTimeField, F, QuerySet
+    from clickhouse_orm import DateTimeField, F, Field, QuerySet, StringField
 
     if isinstance(arg, F):
         return arg.to_sql()
diff --git a/pyproject.toml b/pyproject.toml
index e5ea5a8..397130e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,6 +39,9 @@ flake8 = "^3.9.2"
 flake8-bugbear = "^21.4.3"
 pep8-naming = "^0.12.0"
 pytest = "^6.2.4"
+flake8-isort = "^4.0.0"
+black = "^21.7b0"
+isort = "^5.9.2"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]