CI: Fix before release (#5151)

.github/workflows/test.yml

@@ -78,25 +78,15 @@ jobs:
           git describe
           echo "======"
           conda list
-      # Temporarily pin panel and nbconvert
-      - name: Pin panel and nbconvert on py36
+      # Pin panel on Python 3.6 because one or more dev releases on the 0.13.* series
+      # can be installed on Python 3.6 but are actually not compatible with Python 3.6
+      # Panel 0.13 will support Python >= 3.7 only so the pin here can stay indefinitely.
+      - name: Pin panel on py36
         if: matrix.python-version == '3.6'
         run: |
           eval "$(conda shell.bash hook)"
           conda activate test-environment
-          conda install -c pyviz "panel=0.12.1" "nbconvert>5"
-      - name: Pin panel and nbconvert on py>36
-        if: matrix.python-version != '3.6'
-        run: |
-          eval "$(conda shell.bash hook)"
-          conda activate test-environment
-          conda install -c pyviz "panel=0.12.2" "nbconvert>5"
-      - name: Patch with an older version of freetype since 2.11.0 is broken with Matplotlib on Windows
-        if: (matrix.os == 'windows-latest')
-        run: |
-          eval "$(conda shell.bash hook)"
-          conda activate test-environment
-          conda install ${{ env.CHANS_DEV}} "freetype=2.10.4"
+          conda install -c pyviz "panel=0.12"
       - name: Patch - do not install cffi 1.15.0 on macos and for python != 3.6
         if: matrix.os == 'macos-latest' && matrix.python-version != '3.6'
         run: |

holoviews/tests/plotting/matplotlib/test_graphplot.py

@@ -81,7 +81,7 @@ def test_plot_graph_numerically_colored_edges(self):
                              style=dict(edge_cmap=['#FFFFFF', '#000000']))
         plot = mpl_renderer.get_plot(g)
         edges = plot.handles['edges']
-        self.assertEqual(edges.get_array(), self.weights)
+        self.assertEqual(np.asarray(edges.get_array()), self.weights)
         self.assertEqual(edges.get_clim(), (self.weights.min(), self.weights.max()))
 
     ###########################
@@ -136,10 +136,10 @@ def get_graph(i):
         graph = HoloMap({0: get_graph(0), 1: get_graph(1)}).options(node_color='color', framewise=True)
         plot = mpl_renderer.get_plot(graph)
         artist = plot.handles['nodes']
-        self.assertEqual(artist.get_array(), np.array([0.5, 1.5, 2.5]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([0.5, 1.5, 2.5]))
         self.assertEqual(artist.get_clim(), (0.5, 2.5))
         plot.update((1,))
-        self.assertEqual(artist.get_array(), np.array([3, 2, 1]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([3, 2, 1]))
         self.assertEqual(artist.get_clim(), (1, 3))
 
     def test_graph_op_node_color_categorical(self):
@@ -248,7 +248,7 @@ def test_graph_op_edge_color_linear(self):
         graph = Graph(edges, vdims='color').options(edge_color='color')
         plot = mpl_renderer.get_plot(graph)
         edges = plot.handles['edges']
-        self.assertEqual(edges.get_array(), np.array([2, 0.5, 3]))
+        self.assertEqual(np.asarray(edges.get_array()), np.array([2, 0.5, 3]))
         self.assertEqual(edges.get_clim(), (0.5, 3))
 
     def test_graph_op_edge_color_linear_update(self):
@@ -259,18 +259,18 @@ def test_graph_op_edge_color_linear_update(self):
                      vdims='color')}).options(edge_color='color', framewise=True)
         plot = mpl_renderer.get_plot(graph)
         edges = plot.handles['edges']
-        self.assertEqual(edges.get_array(), np.array([2, 0.5, 3]))
+        self.assertEqual(np.asarray(edges.get_array()), np.array([2, 0.5, 3]))
         self.assertEqual(edges.get_clim(), (0.5, 3))
         plot.update((1,))
-        self.assertEqual(edges.get_array(), np.array([4.3, 1.4, 2.6]))
+        self.assertEqual(np.asarray(edges.get_array()), np.array([4.3, 1.4, 2.6]))
         self.assertEqual(edges.get_clim(), (1.4, 4.3))
 
     def test_graph_op_edge_color_categorical(self):
         edges = [(0, 1, 'C'), (0, 2, 'B'), (1, 3, 'A')]
         graph = Graph(edges, vdims='color').options(edge_color='color')
         plot = mpl_renderer.get_plot(graph)
         edges = plot.handles['edges']
-        self.assertEqual(edges.get_array(), np.array([0, 1, 2]))
+        self.assertEqual(np.asarray(edges.get_array()), np.array([0, 1, 2]))
         self.assertEqual(edges.get_clim(), (0, 2))
 
     def test_graph_op_edge_alpha(self):
@@ -424,7 +424,7 @@ def test_trimesh_op_edge_color_linear_mean_node(self):
         trimesh = TriMesh((edges, Nodes(nodes, vdims='color'))).options(edge_color='color')
         plot = mpl_renderer.get_plot(trimesh)
         artist = plot.handles['edges']
-        self.assertEqual(artist.get_array(), np.array([2, 8/3.]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([2, 8/3.]))
         self.assertEqual(artist.get_clim(), (1, 4))
 
     def test_trimesh_op_edge_color(self):
@@ -442,7 +442,7 @@ def test_trimesh_op_edge_color_linear(self):
         trimesh = TriMesh((edges, nodes), vdims='color').options(edge_color='color')
         plot = mpl_renderer.get_plot(trimesh)
         artist = plot.handles['edges']
-        self.assertEqual(artist.get_array(), np.array([2.4, 3.6]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([2.4, 3.6]))
         self.assertEqual(artist.get_clim(), (2.4, 3.6))
 
     def test_trimesh_op_edge_color_categorical(self):
@@ -451,7 +451,7 @@ def test_trimesh_op_edge_color_categorical(self):
         trimesh = TriMesh((edges, nodes), vdims='color').options(edge_color='color')
         plot = mpl_renderer.get_plot(trimesh)
         artist = plot.handles['edges']
-        self.assertEqual(artist.get_array(), np.array([0, 1]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([0, 1]))
         self.assertEqual(artist.get_clim(), (0, 1))
 
     def test_trimesh_op_edge_alpha(self):
@@ -514,7 +514,7 @@ def test_chord_node_color_style_mapping(self):
         arcs = plot.handles['arcs']
         nodes = plot.handles['nodes']
         self.assertEqual(np.asarray(nodes.get_array()), np.array([0, 1, 2]))
-        self.assertEqual(arcs.get_array(), np.array([0, 1, 2]))
+        self.assertEqual(np.asarray(arcs.get_array()), np.array([0, 1, 2]))
         self.assertEqual(nodes.get_clim(), (0, 2))
         self.assertEqual(arcs.get_clim(), (0, 2))
 
@@ -532,31 +532,31 @@ def test_chord_edge_color_style_mapping(self):
         g = self.chord.opts(style=dict(edge_color=dim('start').astype(str), edge_cmap=['#FFFFFF', '#000000']))
         plot = mpl_renderer.get_plot(g)
         edges = plot.handles['edges']
-        self.assertEqual(edges.get_array(), np.array([0, 0, 1]))
+        self.assertEqual(np.asarray(edges.get_array()), np.array([0, 0, 1]))
         self.assertEqual(edges.get_clim(), (0, 2))
 
     def test_chord_edge_color_linear_style_mapping_update(self):
         hmap = HoloMap({0: self.make_chord(0), 1: self.make_chord(1)}).options(edge_color='weight', framewise=True)
         plot = mpl_renderer.get_plot(hmap)
         edges = plot.handles['edges']
-        self.assertEqual(edges.get_array(), np.array([1, 2, 3]))
+        self.assertEqual(np.asarray(edges.get_array()), np.array([1, 2, 3]))
         self.assertEqual(edges.get_clim(), (1, 3))
         plot.update((1,))
-        self.assertEqual(edges.get_array(), np.array([2, 3, 4]))
+        self.assertEqual(np.asarray(edges.get_array()), np.array([2, 3, 4]))
         self.assertEqual(edges.get_clim(), (2, 4))
 
     def test_chord_node_color_linear_style_mapping_update(self):
         hmap = HoloMap({0: self.make_chord(0), 1: self.make_chord(1)}).options(node_color='Label', framewise=True)
         plot = mpl_renderer.get_plot(hmap)
         arcs = plot.handles['arcs']
         nodes = plot.handles['nodes']
-        self.assertEqual(nodes.get_array(), np.array([0, 1, 2]))
-        self.assertEqual(arcs.get_array(), np.array([0, 1, 2]))
+        self.assertEqual(np.asarray(nodes.get_array()), np.array([0, 1, 2]))
+        self.assertEqual(np.asarray(arcs.get_array()), np.array([0, 1, 2]))
         self.assertEqual(nodes.get_clim(), (0, 2))
         self.assertEqual(arcs.get_clim(), (0, 2))
         plot.update((1,))
-        self.assertEqual(nodes.get_array(), np.array([1, 2, 3]))
-        self.assertEqual(arcs.get_array(), np.array([1, 2, 3]))
+        self.assertEqual(np.asarray(nodes.get_array()), np.array([1, 2, 3]))
+        self.assertEqual(np.asarray(arcs.get_array()), np.array([1, 2, 3]))
         self.assertEqual(nodes.get_clim(), (1, 3))
         self.assertEqual(arcs.get_clim(), (1, 3))
 

holoviews/tests/plotting/matplotlib/test_pathplot.py

@@ -20,7 +20,7 @@ def test_path_continuously_varying_color_op(self):
             color='color', color_levels=levels, cmap=colors)
         plot = mpl_renderer.get_plot(path)
         artist = plot.handles['artist']
-        self.assertEqual(artist.get_array(), np.array(color))
+        self.assertEqual(np.asarray(artist.get_array()), np.array(color))
         self.assertEqual(artist.get_clim(), (994, 999))
 
     def test_path_continuously_varying_alpha_op(self):
@@ -64,7 +64,7 @@ def test_polygons_colored(self):
         plot = mpl_renderer.get_plot(polygons)
         for j, splot in enumerate(plot.subplots.values()):
             artist = splot.handles['artist']
-            self.assertEqual(artist.get_array(), np.array([j]))
+            self.assertEqual(np.asarray(artist.get_array()), np.array([j]))
             self.assertEqual(artist.get_clim(), (0, 4))
 
     def test_polygon_with_hole_plot(self):
@@ -93,7 +93,7 @@ def test_multi_polygon_hole_plot(self):
         poly = Polygons([{'x': xs, 'y': ys, 'holes': holes, 'value': 1}], vdims=['value'])
         plot = mpl_renderer.get_plot(poly)
         artist = plot.handles['artist']
-        self.assertEqual(artist.get_array(), np.array([1, 1]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([1, 1]))
         paths = artist.get_paths()
         self.assertEqual(len(paths), 2)
         path = paths[0]
@@ -145,7 +145,7 @@ def test_polygons_linear_color_op(self):
         ], vdims='color').options(color='color')
         plot = mpl_renderer.get_plot(polygons)
         artist = plot.handles['artist']
-        self.assertEqual(artist.get_array(), np.array([7, 3]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([7, 3]))
         self.assertEqual(artist.get_clim(), (3, 7))
 
     def test_polygons_linear_color_op_update(self):
@@ -161,10 +161,10 @@ def test_polygons_linear_color_op_update(self):
         }).options(color='color', framewise=True)
         plot = mpl_renderer.get_plot(polygons)
         artist = plot.handles['artist']
-        self.assertEqual(artist.get_array(), np.array([7, 3]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([7, 3]))
         self.assertEqual(artist.get_clim(), (3, 7))
         plot.update((1,))
-        self.assertEqual(artist.get_array(), np.array([2, 5]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([2, 5]))
         self.assertEqual(artist.get_clim(), (2, 5))
 
     def test_polygons_categorical_color_op(self):
@@ -174,7 +174,7 @@ def test_polygons_categorical_color_op(self):
         ], vdims='color').options(color='color')
         plot = mpl_renderer.get_plot(polygons)
         artist = plot.handles['artist']
-        self.assertEqual(artist.get_array(), np.array([0, 1]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([0, 1]))
         self.assertEqual(artist.get_clim(), (0, 1))
 
     def test_polygons_alpha_op(self):
@@ -204,7 +204,7 @@ def test_contours_categorical_color(self):
                     vdims='z').opts(plot=dict(color_index='z'))
         plot = mpl_renderer.get_plot(path)
         artist = plot.handles['artist']
-        self.assertEqual(artist.get_array(), np.array([0, 1, 0]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([0, 1, 0]))
         self.assertEqual(artist.get_clim(), (0, 1))
 
     def test_contours_color_op(self):
@@ -246,7 +246,7 @@ def test_contours_linear_color_op(self):
         ], vdims='color').options(color='color')
         plot = mpl_renderer.get_plot(contours)
         artist = plot.handles['artist']
-        self.assertEqual(artist.get_array(), np.array([7, 3]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([7, 3]))
         self.assertEqual(artist.get_clim(), (3, 7))
 
     def test_contours_linear_color_op_update(self):
@@ -262,10 +262,10 @@ def test_contours_linear_color_op_update(self):
         }).options(color='color', framewise=True)
         plot = mpl_renderer.get_plot(contours)
         artist = plot.handles['artist']
-        self.assertEqual(artist.get_array(), np.array([7, 3]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([7, 3]))
         self.assertEqual(artist.get_clim(), (3, 7))
         plot.update((1,))
-        self.assertEqual(artist.get_array(), np.array([2, 5]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([2, 5]))
         self.assertEqual(artist.get_clim(), (2, 5))
 
     def test_contours_categorical_color_op(self):
@@ -275,7 +275,7 @@ def test_contours_categorical_color_op(self):
         ], vdims='color').options(color='color')
         plot = mpl_renderer.get_plot(contours)
         artist = plot.handles['artist']
-        self.assertEqual(artist.get_array(), np.array([0, 1]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([0, 1]))
         self.assertEqual(artist.get_clim(), (0, 1))
 
     def test_contours_alpha_op(self):

holoviews/tests/plotting/matplotlib/test_pointplot.py

@@ -229,7 +229,7 @@ def test_point_linear_color_op_update(self):
         artist = plot.handles['artist']
         self.assertEqual(artist.get_clim(), (0, 2))
         plot.update((1,))
-        self.assertEqual(artist.get_array(), np.array([2.5, 3, 1.2]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([2.5, 3, 1.2]))
         self.assertEqual(artist.get_clim(), (1.2, 3))
 
     def test_point_categorical_color_op(self):

holoviews/tests/plotting/matplotlib/test_spikeplot.py

@@ -124,7 +124,7 @@ def test_spikes_linear_color_op(self):
                         vdims=['y', 'color']).options(color='color')
         plot = mpl_renderer.get_plot(spikes)
         artist = plot.handles['artist']
-        self.assertEqual(artist.get_array(), np.array([0, 1, 2]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([0, 1, 2]))
         self.assertEqual(artist.get_clim(), (0, 2))
 
     def test_spikes_linear_color_op_update(self):
@@ -135,18 +135,18 @@ def test_spikes_linear_color_op_update(self):
                       vdims=['y', 'color'])}).options(color='color', framewise=True)
         plot = mpl_renderer.get_plot(spikes)
         artist = plot.handles['artist']
-        self.assertEqual(artist.get_array(), np.array([0.5, 3.2, 1.8]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([0.5, 3.2, 1.8]))
         self.assertEqual(artist.get_clim(), (0.5, 3.2))
         plot.update((1,))
-        self.assertEqual(artist.get_array(), np.array([0.1, 0.8, 0.3]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([0.1, 0.8, 0.3]))
         self.assertEqual(artist.get_clim(), (0.1, 0.8))
 
     def test_spikes_categorical_color_op(self):
         spikes = Spikes([(0, 0, 'A'), (0, 1, 'B'), (0, 2, 'A')],
                         vdims=['y', 'color']).options(color='color')
         plot = mpl_renderer.get_plot(spikes)
         artist = plot.handles['artist']
-        self.assertEqual(artist.get_array(), np.array([0, 1, 0]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([0, 1, 0]))
         self.assertEqual(artist.get_clim(), (0, 1))
 
     def test_spikes_alpha_op(self):

holoviews/tests/plotting/matplotlib/test_vectorfieldplot.py

@@ -52,18 +52,18 @@ def test_vectorfield_linear_color_op_update(self):
                            vdims=['A', 'M', 'color'])}).options(color='color', framewise=True)
         plot = mpl_renderer.get_plot(vectorfield)
         artist = plot.handles['artist']
-        self.assertEqual(artist.get_array(), np.array([0, 1, 2]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([0, 1, 2]))
         self.assertEqual(artist.get_clim(), (0, 2))
         plot.update((1,))
-        self.assertEqual(artist.get_array(), np.array([3.2, 2, 4]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([3.2, 2, 4]))
         self.assertEqual(artist.get_clim(), (2, 4))
 
     def test_vectorfield_categorical_color_op(self):
         vectorfield = VectorField([(0, 0, 0, 1, 'A'), (0, 1, 0, 1, 'B'), (0, 2, 0, 1, 'C')],
                                   vdims=['A', 'M', 'color']).options(color='color')
         plot = mpl_renderer.get_plot(vectorfield)
         artist = plot.handles['artist']
-        self.assertEqual(artist.get_array(), np.array([0, 1, 2]))
+        self.assertEqual(np.asarray(artist.get_array()), np.array([0, 1, 2]))
         self.assertEqual(artist.get_clim(), (0, 2))
 
     def test_vectorfield_alpha_op(self):

setup.py

@@ -71,7 +71,7 @@
     'path.py',
     'matplotlib >=3',
     'nbsmoke >=0.2.0',
-    'nbconvert <6',
+    'nbconvert',
     'twine',
     'rfc3986',
     'keyring'