Merge pull request #492 from palewire/main

refactor: consolidate mixins into models module

Author: palewire

datawrapper/__init__.py

@@ -74,7 +74,7 @@
     ValueLabelMode,
     ValueLabelPlacement,
 )
-from datawrapper.charts.mixins import (
+from datawrapper.charts.models import (
     CustomRangeMixin,
     CustomTicksMixin,
     GridDisplayMixin,

datawrapper/charts/__init__.py

@@ -34,17 +34,15 @@
     ValueLabelPlacement,
 )
 from .line import AreaFill, Line, LineChart, LineSymbol, LineValueLabel
-from .mixins import (
-    CustomRangeMixin,
-    CustomTicksMixin,
-    GridDisplayMixin,
-    GridFormatMixin,
-)
 from .models import (
     Annotate,
     ColumnFormat,
     ColumnFormatList,
+    CustomRangeMixin,
+    CustomTicksMixin,
     Describe,
+    GridDisplayMixin,
+    GridFormatMixin,
     Logo,
     Publish,
     PublishBlocks,

datawrapper/charts/area.py

@@ -12,13 +12,14 @@
     NumberFormat,
     PlotHeightMode,
 )
-from .mixins import (
+from .models import (
     CustomRangeMixin,
     CustomTicksMixin,
     GridDisplayMixin,
     GridFormatMixin,
+    RangeAnnotation,
+    TextAnnotation,
 )
-from .models import RangeAnnotation, TextAnnotation
 from .serializers import (
     ColorCategory,
     ModelListSerializer,

datawrapper/charts/column.py

@@ -13,13 +13,14 @@
     ValueLabelDisplay,
     ValueLabelPlacement,
 )
-from .mixins import (
+from .models import (
     CustomRangeMixin,
     CustomTicksMixin,
     GridDisplayMixin,
     GridFormatMixin,
+    RangeAnnotation,
+    TextAnnotation,
 )
-from .models import RangeAnnotation, TextAnnotation
 from .serializers import (
     ColorCategory,
     ModelListSerializer,

datawrapper/charts/line.py

@@ -24,13 +24,14 @@
     SymbolShape,
     SymbolStyle,
 )
-from .mixins import (
+from .models import (
     CustomRangeMixin,
     CustomTicksMixin,
     GridDisplayMixin,
     GridFormatMixin,
+    RangeAnnotation,
+    TextAnnotation,
 )
-from .models import RangeAnnotation, TextAnnotation
 from .serializers import (
     ColorCategory,
     ModelListSerializer,

datawrapper/charts/models/__init__.py

@@ -9,6 +9,12 @@
     Sharing,
     Visualize,
 )
+from .mixins import (
+    CustomRangeMixin,
+    CustomTicksMixin,
+    GridDisplayMixin,
+    GridFormatMixin,
+)
 from .range_annotations import (
     RangeAnnotation,
     XLineAnnotation,
@@ -24,7 +30,11 @@
     "ColumnFormat",
     "ColumnFormatList",
     "ConnectorLine",
+    "CustomRangeMixin",
+    "CustomTicksMixin",
     "Describe",
+    "GridDisplayMixin",
+    "GridFormatMixin",
     "Logo",
     "Publish",
     "PublishBlocks",

datawrapper/charts/mixins.py datawrapper/charts/models/mixins.pydatawrapper/charts/mixins.py renamed to datawrapper/charts/models/mixins.py

@@ -4,8 +4,8 @@
 
 from pydantic import Field
 
-from .enums import DateFormat, GridDisplay, NumberFormat
-from .serializers import CustomRange, CustomTicks
+from ..enums import DateFormat, GridDisplay, NumberFormat
+from ..serializers import CustomRange, CustomTicks
 
 
 class GridDisplayMixin:

datawrapper/charts/multiple_column.py

@@ -20,13 +20,14 @@
     ValueLabelDisplay,
     ValueLabelPlacement,
 )
-from .mixins import (
+from .models import (
     CustomRangeMixin,
     CustomTicksMixin,
     GridDisplayMixin,
     GridFormatMixin,
+    RangeAnnotation,
+    TextAnnotation,
 )
-from .models import RangeAnnotation, TextAnnotation
 from .serializers import (
     ColorCategory,
     ModelListSerializer,