Use bqscales

Co-authored-by: Johan Mabille <johan.mabille@gmail.com>
bqplot · Jan 28, 2021 · d07bd54 · d07bd54
1 parent 782b191
commit d07bd54
Show file tree

Hide file tree

Showing 72 changed files with 807 additions and 2,703 deletions.
diff --git a/bqplot/__init__.py b/bqplot/__init__.py
@@ -61,10 +61,10 @@
 
 """
 
+from bqscales.scales import *
 from .figure import *
 from .axes import *
 from .marks import *
-from .scales import *
 from .toolbar import *
 from .default_tooltip import *
 from ._version import version_info, __version__

diff --git a/bqplot/axes.py b/bqplot/axes.py
@@ -31,7 +31,7 @@
 from traittypes import Array
 from ipywidgets import Widget, Color, widget_serialization
 
-from .scales import Scale, ColorScale
+from bqscales import Scale, ColorScale
 from .traits import array_serialization, array_dimension_bounds
 from ._version import __frontend_version__
 

diff --git a/bqplot/figure.py b/bqplot/figure.py
@@ -32,7 +32,7 @@
 )
 from ipywidgets import DOMWidget, register, widget_serialization
 
-from .scales import Scale, LinearScale
+from bqscales import Scale, LinearScale
 from .interacts import Interaction
 from .marks import Mark
 from .axes import Axis

diff --git a/bqplot/interacts.py b/bqplot/interacts.py
@@ -41,7 +41,7 @@
 from traittypes import Array
 from ipywidgets import Widget, Color, widget_serialization, register
 
-from .scales import Scale
+from bqscales import Scale
 from .traits import Date, array_serialization, _array_equal
 from .marks import Lines
 from ._version import __frontend_version__

diff --git a/bqplot/marks.py b/bqplot/marks.py
@@ -51,7 +51,7 @@
 from numpy import histogram
 import numpy as np
 
-from .scales import Scale, OrdinalScale, LinearScale
+from bqscales import Scale, OrdinalScale, LinearScale
 from .traits import (Date, array_serialization,
                      array_squeeze, array_dimension_bounds, array_supported_kinds)
 from ._version import __frontend_version__

diff --git a/bqplot/pyplot.py b/bqplot/pyplot.py
@@ -53,8 +53,8 @@
 from ipywidgets import VBox
 from ipywidgets import Image as ipyImage
 from numpy import arange, issubdtype, array, column_stack, shape
+from bqscales import Scale, LinearScale, Mercator
 from .figure import Figure
-from .scales import Scale, LinearScale, Mercator
 from .axes import Axis
 from .marks import (Lines, Scatter, ScatterGL, Hist, Bars, OHLC, Pie, Map, Image,
                     Label, HeatMap, GridHeatMap, topo_load, Boxplot, Bins)