Pass integers to np.linspace/np.logspace's count.

QuLogic · QuLogic · commit 97e170d2fc2c · 2017-01-28T15:34:50.000-05:00
This fixes "DeprecationWarning: object of type &lt;class 'float'&gt; cannot
be safely interpreted as an integer." raised by latest NumPy.
diff --git a/examples/api/custom_projection_example.py b/examples/api/custom_projection_example.py
@@ -297,7 +297,7 @@ def set_longitude_grid(self, degrees):
         class -- it provides a more convenient interface to set the
         ticking than set_xticks would.
         """
-        number = (360.0 / degrees) + 1
+        number = int(360 / degrees) + 1
         self.xaxis.set_major_locator(
             FixedLocator(
                 np.linspace(-np.pi, np.pi, number, True)[1:-1]))
@@ -311,7 +311,7 @@ def set_latitude_grid(self, degrees):
         class -- it provides a more convenient interface than
         set_yticks would.
         """
-        number = (180.0 / degrees) + 1
+        number = int(180 / degrees) + 1
         self.yaxis.set_major_locator(
             FixedLocator(
                 np.linspace(-np.pi / 2.0, np.pi / 2.0, number, True)[1:-1]))
diff --git a/lib/matplotlib/projections/geo.py b/lib/matplotlib/projections/geo.py
@@ -190,7 +190,7 @@ def set_longitude_grid(self, degrees):
         """
         Set the number of degrees between each longitude grid.
         """
-        number = (360.0 / degrees) + 1
+        number = int(360 / degrees) + 1
         self.xaxis.set_major_locator(
             FixedLocator(
                 np.linspace(-np.pi, np.pi, number, True)[1:-1]))
@@ -200,7 +200,7 @@ def set_latitude_grid(self, degrees):
         """
         Set the number of degrees between each longitude grid.
         """
-        number = (180.0 / degrees) + 1
+        number = int(180 / degrees) + 1
         self.yaxis.set_major_locator(
             FixedLocator(
                 np.linspace(-np.pi / 2.0, np.pi / 2.0, number, True)[1:-1]))
diff --git a/lib/matplotlib/tests/test_path.py b/lib/matplotlib/tests/test_path.py
@@ -96,7 +96,7 @@ def test_make_compound_path_empty():
 def test_xkcd():
     np.random.seed(0)
 
-    x = np.linspace(0, 2.0 * np.pi, 100.0)
+    x = np.linspace(0, 2 * np.pi, 100)
     y = np.sin(x)
 
     with plt.xkcd():
