Retarget #132 to branch-0.9 (#162)

* remove bokeh warning (#132)

Co-authored-by: Jacob Tomlinson <[email protected]>

* Revert "remove bokeh warning (#132)" (#161)

This reverts commit f40fe10.

* Revert "Revert "remove bokeh warning (#132)" (#161)"

This reverts commit f77266d.

---------

Co-authored-by: Reo Ono <[email protected]>

Author: jacobtomlinson

jupyterlab_nvdashboard/apps/cpu.py

@@ -84,8 +84,8 @@ def resource_timeline(doc):
         x_range=x_range,
         tools=tools,
     )
-    disk_fig.line(source=source, x="time", y="disk-read", color="blue", legend="Read")
-    disk_fig.line(source=source, x="time", y="disk-write", color="red", legend="Write")
+    disk_fig.line(source=source, x="time", y="disk-read", color="blue", legend_label="Read")
+    disk_fig.line(source=source, x="time", y="disk-write", color="red", legend_label="Write")
     disk_fig.yaxis.formatter = NumeralTickFormatter(format="0.0b")
     disk_fig.legend.location = "top_left"
 
@@ -96,8 +96,8 @@ def resource_timeline(doc):
         x_range=x_range,
         tools=tools,
     )
-    net_fig.line(source=source, x="time", y="net-read", color="blue", legend="Recv")
-    net_fig.line(source=source, x="time", y="net-sent", color="red", legend="Send")
+    net_fig.line(source=source, x="time", y="net-read", color="blue", legend_label="Recv")
+    net_fig.line(source=source, x="time", y="net-sent", color="red", legend_label="Send")
     net_fig.yaxis.formatter = NumeralTickFormatter(format="0.0b")
     net_fig.legend.location = "top_left"
 

jupyterlab_nvdashboard/apps/gpu.py

@@ -486,10 +486,10 @@ def _get_color(ind):
         tools=tools,
     )
     tot_fig.line(
-        source=source, x="time", y="gpu-total", color="blue", legend="Total-GPU"
+        source=source, x="time", y="gpu-total", color="blue", legend_label="Total-GPU"
     )
     tot_fig.line(
-        source=source, x="time", y="memory-total", color="red", legend="Total-Memory"
+        source=source, x="time", y="memory-total", color="red", legend_label="Total-Memory"
     )
     tot_fig.legend.location = "top_left"
 
@@ -502,8 +502,8 @@ def _get_color(ind):
             x_range=x_range,
             tools=tools,
         )
-        pci_fig.line(source=source, x="time", y="tx-total", color="blue", legend="TX")
-        pci_fig.line(source=source, x="time", y="rx-total", color="red", legend="RX")
+        pci_fig.line(source=source, x="time", y="tx-total", color="blue", legend_label="TX")
+        pci_fig.line(source=source, x="time", y="rx-total", color="red", legend_label="RX")
         pci_fig.yaxis.formatter = NumeralTickFormatter(format="0.0 b")
         pci_fig.legend.location = "top_left"
         figures.append(pci_fig)