Merge pull request #9142 from tacaswell/mnt_memleak_future_numpy

efiring · dstansby · commit 73b63cb93e05 · 2017-09-08T20:45:45.000+01:00
MNT: future numpy only takes ints as index

Deprecate logspace

Deprecate frange
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -186,6 +186,8 @@
     long = int
 
 
+@cbook.deprecated("2.1",
+                  alternative='np.logspace(np.log(xmin), np.log(xmax), N)')
 def logspace(xmin, xmax, N):
     '''
     Return N values logarithmically spaced between xmin and xmax.
@@ -2115,6 +2117,7 @@ def norm_flat(a, p=2):
         return np.sum(np.abs(a) ** p) ** (1 / p)
 
 
+@cbook.deprecated('2.1', alternative='np.linspace(xini, xfin, delta)')
 def frange(xini, xfin=None, delta=None, **kw):
     """
     frange([start,] stop[, step, keywords]) -> array of floats
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
@@ -138,7 +138,6 @@
   fliplr    - flip the rows of a matrix up/down
   flipud    - flip the columns of a matrix left/right
   linspace  - a linear spaced vector of N values from min to max inclusive
-  logspace  - a log spaced vector of N values from min to max inclusive
   meshgrid  - repeat x and y to make regular matrices
   ones      - an array of ones
   rand      - an array from the uniform distribution [0,1]
@@ -246,7 +245,7 @@
     amap, base_repr, binary_repr, bivariate_normal, center_matrix, csv2rec,
     demean, detrend, detrend_linear, detrend_mean, detrend_none, dist,
     dist_point_to_segment, distances_along_curve, entropy, exp_safe,
-    fftsurr, find, frange, get_sparse_matrix, get_xyz_where, griddata,
+    fftsurr, find, get_sparse_matrix, get_xyz_where, griddata,
     identity, inside_poly, is_closed_polygon, ispower2, isvector, l1norm,
     l2norm, log2, longest_contiguous_ones, longest_ones, movavg, norm_flat,
     normpdf, path_length, poly_below, poly_between, prctile, prctile_rank,
diff --git a/unit/memleak.py b/unit/memleak.py
@@ -20,7 +20,7 @@
 def run_memleak_test(bench, iterations, report):
     tracemalloc.start()
 
-    starti = min(50, iterations / 2)
+    starti = min(50, iterations // 2)
     endi = iterations
 
     malloc_arr = np.empty((endi,), dtype=np.int64)
@@ -77,6 +77,7 @@ def run_memleak_test(bench, iterations, report):
 
     if not report.endswith('.pdf'):
         report = report + '.pdf'
+    fig.tight_layout()
     fig.savefig(report, format='pdf')
 
 
