Merge pull request #205 from harmsm/main

fixed deprecated numpy calls

Author: tshead2

toyplot/html.py

@@ -54,7 +54,7 @@ class _CustomJSONEncoder(json.JSONEncoder):
     # pylint: disable=method-hidden
     def default(self, o): # pragma: no cover
         if isinstance(o, numpy.generic):
-            return numpy.asscalar(o)
+            return o.item()
         if isinstance(o, xml.Element):
             return xml.tostring(o, encoding="unicode", method="html")
         return json.JSONEncoder.default(self, o)

toyplot/projection.py

@@ -167,7 +167,7 @@ def __call__(self, domain_values):
                     raise Exception("Unknown scale: %s" % (scale,)) # pragma: no cover
 
         if range_values.shape == ():
-            range_values = numpy.asscalar(range_values)
+            range_values = range_values.item()
         return range_values
 
     def inverse(self, range_values):
@@ -195,7 +195,7 @@ def inverse(self, range_values):
                     raise Exception("Unknown scale: %s" % (scale,)) # pragma: no cover
 
         if domain_values.shape == ():
-            domain_values = numpy.asscalar(domain_values)
+            domain_values = domain_values.item()
         return domain_values
 
 

toyplot/reportlab/__init__.py

@@ -124,11 +124,11 @@ def get_font_family(style):
 
     def set_fill_color(canvas, color):
         canvas.setFillColorRGB(color["r"], color["g"], color["b"])
-        canvas.setFillAlpha(numpy.asscalar(color["a"]))
+        canvas.setFillAlpha(color["a"].item())
 
     def set_stroke_color(canvas, color):
         canvas.setStrokeColorRGB(color["r"], color["g"], color["b"])
-        canvas.setStrokeAlpha(numpy.asscalar(color["a"]))
+        canvas.setStrokeAlpha(color["a"].item())
 
     def render_element(root, element, canvas, styles):
         canvas.saveState()

toyplot/text.py

@@ -41,10 +41,10 @@ def extents(text, angle, style):
 
     for index, theta in enumerate(angle):
         transformation = toyplot.transform.rotation(theta)
-        corner1[index] = corner1[index] * transformation
-        corner2[index] = corner2[index] * transformation
-        corner3[index] = corner3[index] * transformation
-        corner4[index] = corner4[index] * transformation
+        corner1[index] = numpy.diag(corner1[index] * transformation)
+        corner2[index] = numpy.diag(corner2[index] * transformation)
+        corner3[index] = numpy.diag(corner3[index] * transformation)
+        corner4[index] = numpy.diag(corner4[index] * transformation)
 
     left = numpy.minimum(corner1.T[0], numpy.minimum(
         corner2.T[0], numpy.minimum(corner3.T[0], corner4.T[0])))

toyplot/transform.py

@@ -19,4 +19,5 @@ def rotation(angle):
     theta = numpy.radians(angle)
     cos_theta = numpy.cos(theta)
     sin_theta = numpy.sin(theta)
-    return numpy.matrix([[cos_theta, sin_theta], [-sin_theta, cos_theta]])
+
+    return numpy.array([[cos_theta, sin_theta], [-sin_theta, cos_theta]])