Fixed alias np.float which is deprecated in NumPy 1.20

Author: PierreRaybaut

CHANGELOG.md

@@ -10,7 +10,8 @@
   (see PR #61).
 - Removed unused `QwtPlotItem.defaultIcon` method.
 - Added various minor optimizations for axes/ticks drawing features.
-- Fixed `QwtPlot.canvasMap` when `axisScaleDiv` returns None
+- Fixed `QwtPlot.canvasMap` when `axisScaleDiv` returns None.
+- Fixed alias `np.float` which is deprecated in NumPy 1.20.
 
 ## Version 0.8.3
 

README.md

@@ -122,7 +122,7 @@ def array2d_to_qpolygonf(xdata, ydata):
     :return: Polyline
     :rtype: QtGui.QPolygonF
     """
-    dtype = np.float
+    dtype = np.float64
     if not (
         xdata.size == ydata.size == xdata.shape[0] == ydata.shape[0]
         and xdata.dtype == ydata.dtype == dtype

qwt/plot_curve.py

@@ -73,7 +73,7 @@ def array2d_to_qpolygonf(xdata, ydata):
     :return: Polyline
     :rtype: QtGui.QPolygonF
     """
-    dtype = np.float
+    dtype = np.float64
     if not (
         xdata.size == ydata.size == xdata.shape[0] == ydata.shape[0]
         and xdata.dtype == ydata.dtype == dtype

qwt/tests/cpudemo.py

@@ -319,28 +319,28 @@ def __init__(self, *args, unattended=False):
         curve.setColor(Qt.red)
         curve.attach(self)
         self.curves["System"] = curve
-        self.data["System"] = np.zeros(self.HISTORY, np.float)
+        self.data["System"] = np.zeros(self.HISTORY, float)
 
         curve = CpuCurve("User")
         curve.setColor(Qt.blue)
         curve.setZ(curve.z() - 1.0)
         curve.attach(self)
         self.curves["User"] = curve
-        self.data["User"] = np.zeros(self.HISTORY, np.float)
+        self.data["User"] = np.zeros(self.HISTORY, float)
 
         curve = CpuCurve("Total")
         curve.setColor(Qt.black)
         curve.setZ(curve.z() - 2.0)
         curve.attach(self)
         self.curves["Total"] = curve
-        self.data["Total"] = np.zeros(self.HISTORY, np.float)
+        self.data["Total"] = np.zeros(self.HISTORY, float)
 
         curve = CpuCurve("Idle")
         curve.setColor(Qt.darkCyan)
         curve.setZ(curve.z() - 3.0)
         curve.attach(self)
         self.curves["Idle"] = curve
-        self.data["Idle"] = np.zeros(self.HISTORY, np.float)
+        self.data["Idle"] = np.zeros(self.HISTORY, float)
 
         self.showCurve(self.curves["System"], True)
         self.showCurve(self.curves["User"], True)

qwt/tests/data.py

@@ -33,8 +33,8 @@ def __init__(self, *args, unattended=False):
 
         # Initialize data
         self.x = np.arange(0.0, 100.1, 0.5)
-        self.y = np.zeros(len(self.x), np.float)
-        self.z = np.zeros(len(self.x), np.float)
+        self.y = np.zeros(len(self.x), float)
+        self.z = np.zeros(len(self.x), float)
 
         self.setTitle("A Moving QwtPlot Demonstration")
         self.insertLegend(QwtLegend(), QwtPlot.BottomLegend)

qwt/tests/errorbar.py

@@ -100,11 +100,11 @@ def setData(self, *args):
             if len(args) > 3:
                 dy = args[3]
 
-        self.__x = np.asarray(x, np.float)
+        self.__x = np.asarray(x, float)
         if len(self.__x.shape) != 1:
             raise RuntimeError("len(asarray(x).shape) != 1")
 
-        self.__y = np.asarray(y, np.float)
+        self.__y = np.asarray(y, float)
         if len(self.__y.shape) != 1:
             raise RuntimeError("len(asarray(y).shape) != 1")
         if len(self.__x) != len(self.__y):
@@ -113,14 +113,14 @@ def setData(self, *args):
         if dx is None:
             self.__dx = None
         else:
-            self.__dx = np.asarray(dx, np.float)
+            self.__dx = np.asarray(dx, float)
         if len(self.__dx.shape) not in [0, 1, 2]:
             raise RuntimeError("len(asarray(dx).shape) not in [0, 1, 2]")
 
         if dy is None:
             self.__dy = dy
         else:
-            self.__dy = np.asarray(dy, np.float)
+            self.__dy = np.asarray(dy, float)
         if len(self.__dy.shape) not in [0, 1, 2]:
             raise RuntimeError("len(asarray(dy).shape) not in [0, 1, 2]")
 
@@ -282,7 +282,7 @@ def __init__(self, parent=None, title=None):
         grid.setPen(QPen(Qt.black, 0, Qt.DotLine))
 
         # calculate data and errors for a curve with error bars
-        x = np.arange(0, 10.1, 0.5, np.float)
+        x = np.arange(0, 10.1, 0.5, float)
         y = np.sin(x)
         dy = 0.2 * abs(y)
         # dy = (0.15 * abs(y), 0.25 * abs(y)) # uncomment for asymmetric error bars

qwt/tests/eventfilter.py

@@ -201,8 +201,8 @@ def __insertCurve(self, orientation, color, base):
         curve.setSymbol(
             QwtSymbol(QwtSymbol.Ellipse, QBrush(Qt.gray), QPen(color), QSize(8, 8))
         )
-        fixed = base * np.ones(10, np.float)
-        changing = np.arange(0, 95.0, 10.0, np.float) + 5.0
+        fixed = base * np.ones(10, float)
+        changing = np.arange(0, 95.0, 10.0, float) + 5.0
         if orientation == Qt.Horizontal:
             curve.setData(changing, fixed)
         else:
@@ -324,8 +324,8 @@ def __move(self, pos):
         curve = self.__selectedCurve
         if not curve:
             return
-        xData = np.zeros(curve.dataSize(), np.float)
-        yData = np.zeros(curve.dataSize(), np.float)
+        xData = np.zeros(curve.dataSize(), float)
+        yData = np.zeros(curve.dataSize(), float)
         for i in range(curve.dataSize()):
             if i == self.__selectedPoint:
                 xData[i] = self.__plot.invTransform(curve.xAxis(), pos.x())

qwt/tests/mapdemo.py

@@ -44,8 +44,8 @@ def __init__(self, *args):
         self.setCentralWidget(self.plot)
         # Initialize map data
         self.count = self.i = 1000
-        self.xs = np.zeros(self.count, np.float)
-        self.ys = np.zeros(self.count, np.float)
+        self.xs = np.zeros(self.count, float)
+        self.ys = np.zeros(self.count, float)
         self.kappa = 0.2
         self.curve = QwtPlotCurve("Map")
         self.curve.attach(self.plot)