sort imports

wcervini · Sep 4, 2021 · cbc3d02 · cbc3d02
1 parent 5c50ae8
commit cbc3d02
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 93 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -2,22 +2,6 @@
 requires = ["flit_core >=2,<4"]
 build-backend = "flit_core.buildapi"
 
-[tool.isort]
-line_length = 90
-combine_as_imports = true
-balanced_wrapping = true
-lines_after_imports = 2
-skip = "venvs/"
-not_skip = "__init__.py"
-multi_line_output = 5
-include_trailing_comma = true
-
-import_heading_stdlib = "built-in"
-import_heading_thirdparty = "external"
-import_heading_firstparty = "project"
-import_heading_localfolder = "app"
-
-
 [tool.flit.metadata]
 module = "svg"
 license = "MIT"
@@ -43,3 +27,7 @@ dev = [
     "mypy",
     "pytest",
 ]
+
+[tool.isort]
+profile = "django"
+lines_after_imports = 2
diff --git a/reflect/__init__.py b/reflect/__init__.py
@@ -1,4 +1,5 @@
-from ._mdn_attr import MDNAttr
 from ._lib_element import LibElement
+from ._mdn_attr import MDNAttr
+
 
 __all__ = ['LibElement', 'MDNAttr']
diff --git a/reflect/_lib_element.py b/reflect/_lib_element.py
@@ -1,7 +1,8 @@
 from dataclasses import dataclass, fields
+from functools import cached_property
 from typing import List, Set
+
 import svg
-from functools import cached_property
 
 
 @dataclass

diff --git a/reflect/_mdn_attr.py b/reflect/_mdn_attr.py
@@ -1,9 +1,10 @@
+import re
 from dataclasses import dataclass
-from typing import List, Optional, Set
+from functools import cached_property
 from pathlib import Path
-import re
+from typing import List, Optional, Set
+
 import yaml
-from functools import cached_property
 
 
 REX_EL = re.compile(r'li>\{\{\s*SVGElement\(["\']([a-zA-Z-]+)["\']\)\s*\}\}\.?</')

diff --git a/scripts/actualize_deprecated.py b/scripts/actualize_deprecated.py
@@ -1,5 +1,6 @@
 from pathlib import Path
 
+
 POJECT_ROOT = Path(__file__).parent.parent.absolute()
 
 

diff --git a/svg/__init__.py b/svg/__init__.py
@@ -2,74 +2,18 @@
 """
 from . import values
 from .elements import (
-    Animate,
-    AnimateMotion,
-    AnimateTransform,
-    Circle,
-    ClipPath,
-    Defs,
-    Element,
-    Ellipse,
-    Line,
-    LinearGradient,
-    Marker,
-    Path,
-    Pattern,
-    Polygon,
-    Polyline,
-    RadialGradient,
-    Rect,
-    Stop,
-    Text,
-    TextPath,
-    Transform,
-    Use,
-    SVG,
-    G,
-    Desc,
-    Title,
-    Symbol,
-    Image,
-    Switch,
-    Style,
-    TSpan,
-    ColorProfile,
-    Mask,
-    View,
-    A,
-    Script,
-    ForeignObject,
-    Set,
-    MPath,
-    DefinitionSrc,
-    Metadata,
+    SVG, A, Animate, AnimateMotion, AnimateTransform, Circle, ClipPath,
+    ColorProfile, DefinitionSrc, Defs, Desc, Element, Ellipse, ForeignObject,
+    G, Image, Line, LinearGradient, Marker, Mask, Metadata, MPath, Path,
+    Pattern, Polygon, Polyline, RadialGradient, Rect, Script, Set, Stop, Style,
+    Switch, Symbol, Text, TextPath, Title, Transform, TSpan, Use, View,
 )
 from .filters import (
-    Filter,
-    FeGaussianBlur,
-    FeImage,
-    FeMerge,
-    FeMergeNode,
-    FeOffset,
-    FeSpecularLighting,
-    FeTile,
-    FeTurbulence,
-    FeBlend,
-    FeFuncR,
-    FeFuncG,
-    FeFuncB,
-    FeFuncA,
-    FeFlood,
-    FeConvolveMatrix,
-    FeComponentTransfer,
-    FeComposite,
-    FeDistantLight,
-    FePointLight,
-    FeSpotLight,
-    FeColorMatrix,
-    FeDiffuseLighting,
-    FeDisplacementMap,
-    FeMorphology,
+    FeBlend, FeColorMatrix, FeComponentTransfer, FeComposite, FeConvolveMatrix,
+    FeDiffuseLighting, FeDisplacementMap, FeDistantLight, FeFlood, FeFuncA,
+    FeFuncB, FeFuncG, FeFuncR, FeGaussianBlur, FeImage, FeMerge, FeMergeNode,
+    FeMorphology, FeOffset, FePointLight, FeSpecularLighting, FeSpotLight,
+    FeTile, FeTurbulence, Filter,
 )
 
 

diff --git a/svg/_mixins.py b/svg/_mixins.py
@@ -1,8 +1,10 @@
 from dataclasses import dataclass
 from typing import Optional, Union
-from . import values
+
 from typing_extensions import Literal
 
+from . import values
+
 
 class AttrsMixin:
     pass

diff --git a/svg/elements.py b/svg/elements.py
@@ -1,9 +1,11 @@
-from dataclasses import dataclass, asdict
+from dataclasses import asdict, dataclass
 from enum import Enum
 from typing import Any, ClassVar, Dict, List, Optional, Union
+
+from typing_extensions import Literal
+
 from . import _mixins as m, values
 from .transforms import Transform
-from typing_extensions import Literal
 
 
 @dataclass

diff --git a/svg/filters.py b/svg/filters.py
@@ -1,8 +1,10 @@
 from dataclasses import dataclass
 from typing import Any, List, Optional, Union
-from . import _mixins as m, values, elements as e
-from .elements import Element
+
 from typing_extensions import Literal
+
+from . import _mixins as m, elements as e, values
+from .elements import Element
 from .transforms import Transform
 
 

diff --git a/svg/values.py b/svg/values.py
@@ -1,6 +1,6 @@
+from dataclasses import dataclass
 from decimal import Decimal
 from typing import List, Tuple, Union
-from dataclasses import dataclass
 
 from typing_extensions import Literal
 

diff --git a/tests/test_attributes.py b/tests/test_attributes.py
@@ -1,7 +1,10 @@
 from pathlib import Path
+
 import pytest
+
 import reflect
 
+
 LIB_ELEMENTS = reflect.LibElement.parse_all()
 MDN_ROOT = Path(__file__).parent.parent.parent / 'mdn-source' / 'files' / 'en-us' / 'web' / 'svg'
 MDN_ATTRS = reflect.MDNAttr.parse_all(MDN_ROOT)

diff --git a/tests/test_elements.py b/tests/test_elements.py
@@ -1,5 +1,6 @@
 
 from pathlib import Path
+
 import pytest
 
 import svg
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,6 @@
		from pathlib import Path


		POJECT_ROOT = Path(__file__).parent.parent.absolute()


Expand Down