Remove import

holoviews/__init__.py

@@ -84,7 +84,7 @@
 from . import util                                       # noqa (API import)
 from .core import archive, config                        # noqa (API import)
 from .core.boundingregion import BoundingBox             # noqa (API import)
-from .core.dimension import OrderedDict, Dimension       # noqa (API import)
+from .core.dimension import Dimension                    # noqa (API import)
 from .core.element import Element, Collator              # noqa (API import)
 from .core.layout import (Layout, NdLayout, Empty,       # noqa (API import)
                           AdjointLayout)

holoviews/annotators.py

@@ -1,6 +1,5 @@
 import sys
 
-from collections import OrderedDict
 from inspect import getmro
 
 import param

holoviews/core/accessors.py

@@ -4,7 +4,6 @@
 import copy
 import sys
 
-from collections import OrderedDict
 from functools import wraps
 from types import FunctionType
 

holoviews/core/data/__init__.py

@@ -15,7 +15,7 @@
     Dimension, Dimensioned, LabelledData, dimension_name, process_dimensions
 )
 from ..element import Element
-from ..ndmapping import OrderedDict, MultiDimensionalMapping
+from ..ndmapping import MultiDimensionalMapping
 from ..spaces import HoloMap, DynamicMap
 from .. import util as core_util
 

holoviews/core/data/dask.py

@@ -6,7 +6,7 @@
 from .. import util
 from ..dimension import Dimension
 from ..element import Element
-from ..ndmapping import NdMapping, item_check, OrderedDict, sorted_context
+from ..ndmapping import NdMapping, item_check, sorted_context
 from .interface import Interface
 from .pandas import PandasInterface
 

holoviews/core/data/dictionary.py

@@ -1,4 +1,4 @@
-from collections import OrderedDict, defaultdict
+from collections import defaultdict
 
 import numpy as np
 

holoviews/core/data/grid.py

@@ -1,4 +1,4 @@
-from collections import OrderedDict, defaultdict
+from collections import defaultdict
 
 import numpy as np
 

holoviews/core/data/pandas.py

@@ -1,4 +1,3 @@
-from collections import OrderedDict
 from packaging.version import Version
 
 import numpy as np

holoviews/core/data/xarray.py

@@ -1,7 +1,6 @@
 import sys
 import types
 
-from collections import OrderedDict
 
 import numpy as np
 import pandas as pd

holoviews/core/dimension.py

@@ -22,7 +22,7 @@
 from .options import Store, Options, cleanup_custom_options
 from .pprint import PrettyPrinter
 from .tree import AttrTree
-from .util import OrderedDict, bytes_to_unicode
+from .util import bytes_to_unicode
 
 # Alias parameter support for pickle loading
 

holoviews/core/element.py

@@ -6,7 +6,7 @@
 
 from .dimension import Dimensioned, ViewableElement, asdim
 from .layout import Composable, Layout, NdLayout
-from .ndmapping import OrderedDict, NdMapping
+from .ndmapping import NdMapping
 from .overlay import Overlayable, NdOverlay, CompositeOverlay
 from .spaces import HoloMap, GridSpace
 from .tree import AttrTree

holoviews/core/io.py

@@ -32,7 +32,7 @@
 from .dimension import LabelledData
 from .element import Collator, Element
 from .overlay import Overlay, Layout
-from .ndmapping import OrderedDict, NdMapping, UniformNdMapping
+from .ndmapping import NdMapping, UniformNdMapping
 from .options import Store
 from .util import unique_iterator, group_sanitizer, label_sanitizer
 

holoviews/core/layout.py

@@ -9,7 +9,7 @@
 import numpy as np
 
 from .dimension import Dimension, Dimensioned, ViewableElement, ViewableTree
-from .ndmapping import OrderedDict, NdMapping, UniformNdMapping
+from .ndmapping import NdMapping, UniformNdMapping
 from . import traversal
 
 

holoviews/core/ndmapping.py

@@ -4,7 +4,6 @@
 also enables slicing over multiple dimension ranges.
 """
 
-from collections import OrderedDict
 from itertools import cycle
 from operator import itemgetter
 import numpy as np

holoviews/core/options.py

@@ -46,7 +46,7 @@
 from .accessors import Opts # noqa (clean up in 2.0)
 from .tree import AttrTree
 from .util import (
-    OrderedDict, group_sanitizer, label_sanitizer, sanitize_identifier
+    group_sanitizer, label_sanitizer, sanitize_identifier
 )
 from .pprint import InfoPrinter
 

holoviews/core/overlay.py

@@ -7,7 +7,6 @@
 for indexing, slicing and animating collections of Views.
 """
 
-from collections import OrderedDict
 from functools import reduce
 import numpy as np
 

holoviews/core/spaces.py

@@ -13,7 +13,7 @@
 
 from . import traversal, util
 from .accessors import Opts, Redim
-from .dimension import OrderedDict, Dimension, ViewableElement
+from .dimension import Dimension, ViewableElement
 from .layout import Layout, AdjointLayout, NdLayout, Empty, Layoutable
 from .ndmapping import UniformNdMapping, NdMapping, item_check
 from .overlay import Overlay, CompositeOverlay, NdOverlay, Overlayable

holoviews/core/tree.py

@@ -1,4 +1,3 @@
-from collections import OrderedDict
 
 from . import util
 from .pprint import PrettyPrinter

holoviews/core/util.py

@@ -14,7 +14,7 @@
 import unicodedata
 import datetime as dt
 
-from collections import defaultdict, OrderedDict, namedtuple
+from collections import defaultdict, namedtuple
 from contextlib import contextmanager
 from packaging.version import Version
 from functools import partial

holoviews/element/comparison.py

@@ -27,7 +27,7 @@
 from . import *    # noqa (All Elements need to support comparison)
 from ..core import (Element, Empty, AdjointLayout, Overlay, Dimension,
                     HoloMap, Dimensioned, Layout, NdLayout, NdOverlay,
-                    GridSpace, DynamicMap, GridMatrix, OrderedDict)
+                    GridSpace, DynamicMap, GridMatrix)
 from ..core.options import Options, Cycle
 from ..core.util import (cast_array_to_int64, datetime_types, dt_to_int,
                          is_float)

holoviews/element/path.py

@@ -11,7 +11,6 @@
 from ..core import Dataset
 from ..core.data import MultiInterface
 from ..core.dimension import Dimension
-from ..core.util import OrderedDict
 from .geom import Geometry
 from .selection import SelectionPolyExpr
 

holoviews/element/stats.py

@@ -4,7 +4,7 @@
 from ..core.dimension import Dimension, process_dimensions
 from ..core.data import Dataset
 from ..core.element import Element, Element2D
-from ..core.util import get_param_values, unique_iterator, OrderedDict
+from ..core.util import get_param_values, unique_iterator
 from .selection import Selection1DExpr, Selection2DExpr
 
 

holoviews/element/tabular.py

@@ -1,4 +1,3 @@
-from collections import OrderedDict
 
 import numpy as np
 

holoviews/element/util.py

@@ -4,7 +4,7 @@
 import numpy as np
 import pandas as pd
 
-from ..core import Dataset, OrderedDict
+from ..core import Dataset
 from ..core.boundingregion import BoundingBox
 from ..core.data import default_datatype, PandasInterface
 from ..core.operation import Operation

holoviews/operation/datashader.py

@@ -1,6 +1,5 @@
 import warnings
 
-from collections import OrderedDict
 from collections.abc import Callable, Iterable
 from functools import partial
 

holoviews/plotting/bokeh/callbacks.py

@@ -2,7 +2,7 @@
 import base64
 import time
 
-from collections import defaultdict, OrderedDict
+from collections import defaultdict
 
 import numpy as np
 

holoviews/plotting/bokeh/chart.py

@@ -12,7 +12,7 @@
 from ...core.data import Dataset
 from ...core.dimension import dimension_name
 from ...core.util import (
-    OrderedDict, dimension_sanitizer, isfinite
+    dimension_sanitizer, isfinite
 )
 from ...operation import interpolate_curve
 from ...util.transform import dim

holoviews/plotting/bokeh/plot.py

@@ -12,7 +12,7 @@
 
 from ...selection import NoOpSelectionDisplay
 from ...core import (
-    OrderedDict, Store, AdjointLayout, NdLayout, Layout, Empty,
+    Store, AdjointLayout, NdLayout, Layout, Empty,
     GridSpace, HoloMap, Element
 )
 from ...core.options import SkipRendering

holoviews/plotting/mpl/element.py

@@ -13,7 +13,7 @@
 from packaging.version import Version
 
 from ...core import util
-from ...core import (OrderedDict, NdOverlay, DynamicMap, Dataset,
+from ...core import (NdOverlay, DynamicMap, Dataset,
                      CompositeOverlay, Element3D, Element)
 from ...core.options import abbreviated_exception, Keywords
 from ...element import Graph, Path

holoviews/plotting/mpl/plot.py

@@ -10,7 +10,7 @@
 from matplotlib import gridspec, animation, rcParams
 from matplotlib.font_manager import font_scalings
 
-from ...core import (OrderedDict, HoloMap, AdjointLayout, NdLayout,
+from ...core import (HoloMap, AdjointLayout, NdLayout,
                      GridSpace, Element, CompositeOverlay, Empty,
                      Collator, GridMatrix, Layout)
 from ...core.options import Store, SkipRendering

holoviews/plotting/plot.py

@@ -7,7 +7,7 @@
 import warnings
 
 from ast import literal_eval
-from collections import Counter, defaultdict, OrderedDict
+from collections import Counter, defaultdict
 from functools import partial
 from itertools import groupby, product
 

holoviews/plotting/plotly/dash.py

@@ -1,7 +1,7 @@
 # standard library imports
 import uuid
 import copy
-from collections import OrderedDict, namedtuple
+from collections import namedtuple
 import pickle
 import base64
 

holoviews/plotting/plotly/plot.py

@@ -1,7 +1,7 @@
 import param
 
 from holoviews.plotting.util import attach_streams
-from ...core import (OrderedDict, NdLayout, AdjointLayout, Empty,
+from ...core import (NdLayout, AdjointLayout, Empty,
                      HoloMap, GridSpace, GridMatrix)
 from ...element import Histogram
 from ...core.options import Store

holoviews/selection.py

@@ -6,7 +6,6 @@
 from param.parameterized import bothmethod
 
 from .core.data import Dataset
-from .core.dimension import OrderedDict
 from .core.element import Element, Layout
 from .core.options import CallbackError, Store
 from .core.overlay import NdOverlay, Overlay

holoviews/tests/core/data/base.py

@@ -13,7 +13,6 @@
 from holoviews.element.comparison import ComparisonTestCase
 from holoviews.util.transform import dim
 
-from collections import OrderedDict
 
 import pandas as pd
 

holoviews/tests/core/data/test_binneddatasets.py

@@ -10,7 +10,6 @@
 from holoviews.core.spaces import HoloMap
 from holoviews.core.data import Dataset
 from holoviews.core.data.interface import DataError
-from holoviews.core.util import OrderedDict
 from holoviews.element import Histogram, QuadMesh
 from holoviews.element.comparison import ComparisonTestCase
 from holoviews.util.transform import dim

holoviews/tests/core/data/test_dictinterface.py

@@ -1,5 +1,3 @@
-from collections import OrderedDict
-
 import numpy as np
 
 from holoviews.core.data import Dataset
@@ -13,7 +11,7 @@ class DictDatasetTest(HeterogeneousColumnTests, ScalarColumnTests, InterfaceTest
     """
 
     datatype = 'dictionary'
-    data_type = (OrderedDict,)
+    data_type = (dict,)
 
     __test__ = True
 

holoviews/tests/core/data/test_gridinterface.py

@@ -1,6 +1,5 @@
 import datetime as dt
 
-from collections import OrderedDict
 from itertools import product
 from unittest import SkipTest
 

holoviews/tests/core/data/test_xarrayinterface.py

@@ -1,6 +1,5 @@
 import datetime as dt
 
-from collections import OrderedDict
 from unittest import SkipTest
 
 import numpy as np

holoviews/tests/core/test_ndmapping.py

@@ -1,4 +1,3 @@
-from collections import OrderedDict
 
 import numpy as np
 

holoviews/tests/core/test_utils.py

@@ -6,7 +6,6 @@
 import unittest
 
 from itertools import product
-from collections import OrderedDict
 
 import numpy as np
 import pandas as pd

holoviews/tests/plotting/bokeh/test_elementplot.py

@@ -1,7 +1,6 @@
 import datetime as dt
 
 from unittest import SkipTest
-from collections import OrderedDict
 
 import numpy as np
 import pytest

holoviews/tests/plotting/bokeh/test_renderer.py

@@ -1,4 +1,3 @@
-from collections import OrderedDict
 from io import BytesIO
 from unittest import SkipTest
 

holoviews/tests/plotting/matplotlib/test_renderer.py

@@ -3,7 +3,6 @@
 """
 import subprocess
 
-from collections import OrderedDict
 from unittest import SkipTest
 
 import numpy as np

holoviews/tests/plotting/plotly/test_renderer.py

@@ -1,7 +1,6 @@
 """
 Test cases for rendering exporters
 """
-from collections import OrderedDict
 
 import panel as pn
 import param

holoviews/tests/util/test_transform.py

@@ -6,7 +6,6 @@
 
 import holoviews as hv
 
-from collections import OrderedDict
 from unittest import skipIf
 
 import numpy as np

holoviews/tests/util/test_utils.py

@@ -2,7 +2,6 @@
 Unit tests of the helper functions in utils
 """
 from unittest import SkipTest
-from collections import OrderedDict
 
 from holoviews import notebook_extension
 from holoviews.element.comparison import ComparisonTestCase

holoviews/util/__init__.py

@@ -18,7 +18,7 @@
 from ..core.options import Keywords, Options, options_policy
 from ..core.operation import Operation
 from ..core.overlay import Overlay
-from ..core.util import merge_options_to_dict, OrderedDict
+from ..core.util import merge_options_to_dict
 from ..core.operation import OperationCallable
 from ..core import util
 from ..operation.element import function

holoviews/util/settings.py

@@ -1,4 +1,4 @@
-from collections import defaultdict, OrderedDict
+from collections import defaultdict
 from ..core import Store