Merge pull request #16514 from QuLogic/reviews

dstansby · web-flow · commit 487fc05b157e · 2020-02-15T10:46:21.000Z
Various delayed PR reviews
diff --git a/examples/animation/bayes_update.py b/examples/animation/bayes_update.py
@@ -41,6 +41,10 @@ def __init__(self, ax, prob=0.5):
     def __call__(self, i):
         # This way the plot can continuously run and we just keep
         # watching new realizations of the process
+        if i == 0:
+            self.success = 0
+            self.line.set_data([], [])
+            return self.line,
 
         # Choose success based on exceed a threshold with a uniform pick
         if np.random.rand(1,) < self.prob:
diff --git a/examples/scales/logit_demo.py b/examples/scales/logit_demo.py
@@ -14,8 +14,7 @@
 xmax = 10
 x = np.linspace(-xmax, xmax, 10000)
 cdf_norm = [math.erf(w / np.sqrt(2)) / 2 + 1 / 2 for w in x]
-cdf_laplacian = [1 / 2 * np.exp(w) if w < 0 else 1 - 1 / 2 * np.exp(-w)
-                 for w in x]
+cdf_laplacian = np.where(x < 0, 1 / 2 * np.exp(x), 1 - 1 / 2 * np.exp(-x))
 cdf_cauchy = np.arctan(x) / np.pi + 1 / 2
 
 fig, axs = plt.subplots(nrows=3, ncols=2, figsize=(6.4, 8.5))
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
@@ -172,15 +172,14 @@ def baseline_images(request, fontset, index):
     return ['%s_%s_%02d' % (request.param, fontset, index)]
 
 
-# recwarn suppresses warnings regarding the deprecation of \stackrel.
 @pytest.mark.parametrize('index, test', enumerate(math_tests),
                          ids=[str(index) for index in range(len(math_tests))])
 @pytest.mark.parametrize('fontset',
                          ['cm', 'stix', 'stixsans', 'dejavusans',
                           'dejavuserif'])
 @pytest.mark.parametrize('baseline_images', ['mathtext'], indirect=True)
 @image_comparison(baseline_images=None)
-def test_mathtext_rendering(baseline_images, fontset, index, test, recwarn):
+def test_mathtext_rendering(baseline_images, fontset, index, test):
     matplotlib.rcParams['mathtext.fontset'] = fontset
     fig = plt.figure(figsize=(5.25, 0.75))
     fig.text(0.5, 0.5, test,
diff --git a/lib/matplotlib/tests/test_mlab.py b/lib/matplotlib/tests/test_mlab.py
@@ -1107,8 +1107,8 @@ def test_spectral_helper_raises(self):
             {"y": self.y+1, "mode": "phase"},
             {"mode": "spam"},  # Bad mode.
             {"y": self.y, "sides": "eggs"},  # Bad sides.
-            {"NFFT": 10, "noverlap": 20},  # noverlap > NFFT.
-            {"y": self.y, "NFFT": 10, "noverlap": 20},  # noverlap == NFFT.
+            {"y": self.y, "NFFT": 10, "noverlap": 20},  # noverlap > NFFT.
+            {"NFFT": 10, "noverlap": 10},  # noverlap == NFFT.
             {"y": self.y, "NFFT": 10,
              "window": np.ones(9)},  # len(win) != NFFT.
         ]:
@@ -1361,6 +1361,7 @@ def test_spectrum(self, kind):
         assert spec.shape == freqs.shape
         if kind == "magnitude":
             self.check_maxfreq(spec, fsp, self.fstims)
+            self.check_freqs(spec, freqs, fsp, self.fstims)
 
     @pytest.mark.parametrize(
         'kwargs',
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -9,7 +9,6 @@
 from numpy.testing import assert_almost_equal, assert_array_equal
 import pytest
 
-import matplotlib
 import matplotlib as mpl
 from matplotlib import cbook
 import matplotlib.pyplot as plt
@@ -70,7 +69,7 @@ def test_view_limits(self):
         """
         Test basic behavior of view limits.
         """
-        with matplotlib.rc_context({'axes.autolimit_mode': 'data'}):
+        with mpl.rc_context({'axes.autolimit_mode': 'data'}):
             loc = mticker.MultipleLocator(base=3.147)
             assert_almost_equal(loc.view_limits(-5, 5), (-5, 5))
 
@@ -79,7 +78,7 @@ def test_view_limits_round_numbers(self):
         Test that everything works properly with 'round_numbers' for auto
         limit.
         """
-        with matplotlib.rc_context({'axes.autolimit_mode': 'round_numbers'}):
+        with mpl.rc_context({'axes.autolimit_mode': 'round_numbers'}):
             loc = mticker.MultipleLocator(base=3.147)
             assert_almost_equal(loc.view_limits(-4, 4), (-6.294, 6.294))
 
@@ -130,7 +129,7 @@ def test_low_number_of_majorticks(
     # This test is meant to verify the parameterization for
     # test_number_of_minor_ticks
     def test_using_all_default_major_steps(self):
-        with matplotlib.rc_context({'_internal.classic_mode': False}):
+        with mpl.rc_context({'_internal.classic_mode': False}):
             majorsteps = [x[0] for x in self.majorstep_minordivisions]
             np.testing.assert_allclose(majorsteps,
                                        mticker.AutoLocator()._steps)
@@ -516,7 +515,7 @@ class TestScalarFormatter:
     @pytest.mark.parametrize('unicode_minus, result',
                              [(True, "\N{MINUS SIGN}1"), (False, "-1")])
     def test_unicode_minus(self, unicode_minus, result):
-        matplotlib.rcParams['axes.unicode_minus'] = unicode_minus
+        mpl.rcParams['axes.unicode_minus'] = unicode_minus
         assert (
             plt.gca().xaxis.get_major_formatter().format_data_short(-1).strip()
             == result)
@@ -540,7 +539,7 @@ def test_offset_value(self, left, right, offset):
 
     @pytest.mark.parametrize('use_offset', use_offset_data)
     def test_use_offset(self, use_offset):
-        with matplotlib.rc_context({'axes.formatter.useoffset': use_offset}):
+        with mpl.rc_context({'axes.formatter.useoffset': use_offset}):
             tmp_form = mticker.ScalarFormatter()
             assert use_offset == tmp_form.get_useOffset()
 
@@ -618,8 +617,7 @@ class TestLogFormatterMathtext:
 
     @pytest.mark.parametrize('min_exponent, value, expected', test_data)
     def test_min_exponent(self, min_exponent, value, expected):
-        with matplotlib.rc_context({'axes.formatter.min_exponent':
-                                    min_exponent}):
+        with mpl.rc_context({'axes.formatter.min_exponent': min_exponent}):
             assert self.fmt(value) == expected
 
 
@@ -648,7 +646,7 @@ class TestLogFormatterSciNotation:
     def test_basic(self, base, value, expected):
         formatter = mticker.LogFormatterSciNotation(base=base)
         formatter.sublabel = {1, 2, 5, 1.2}
-        with matplotlib.rc_context({'text.usetex': False}):
+        with mpl.rc_context({'text.usetex': False}):
             assert formatter(value) == expected
 
 
@@ -1231,38 +1229,38 @@ class TestPercentFormatter:
     def test_basic(self, xmax, decimals, symbol,
                    x, display_range, expected):
         formatter = mticker.PercentFormatter(xmax, decimals, symbol)
-        with matplotlib.rc_context(rc={'text.usetex': False}):
+        with mpl.rc_context(rc={'text.usetex': False}):
             assert formatter.format_pct(x, display_range) == expected
 
     @pytest.mark.parametrize('is_latex, usetex, expected', latex_data)
     def test_latex(self, is_latex, usetex, expected):
         fmt = mticker.PercentFormatter(symbol='\\{t}%', is_latex=is_latex)
-        with matplotlib.rc_context(rc={'text.usetex': usetex}):
+        with mpl.rc_context(rc={'text.usetex': usetex}):
             assert fmt.format_pct(50, 100) == expected
 
 
 def test_majformatter_type():
     fig, ax = plt.subplots()
     with pytest.raises(TypeError):
-        ax.xaxis.set_major_formatter(matplotlib.ticker.LogLocator())
+        ax.xaxis.set_major_formatter(mticker.LogLocator())
 
 
 def test_minformatter_type():
     fig, ax = plt.subplots()
     with pytest.raises(TypeError):
-        ax.xaxis.set_minor_formatter(matplotlib.ticker.LogLocator())
+        ax.xaxis.set_minor_formatter(mticker.LogLocator())
 
 
 def test_majlocator_type():
     fig, ax = plt.subplots()
     with pytest.raises(TypeError):
-        ax.xaxis.set_major_locator(matplotlib.ticker.LogFormatter())
+        ax.xaxis.set_major_locator(mticker.LogFormatter())
 
 
 def test_minlocator_type():
     fig, ax = plt.subplots()
     with pytest.raises(TypeError):
-        ax.xaxis.set_minor_locator(matplotlib.ticker.LogFormatter())
+        ax.xaxis.set_minor_locator(mticker.LogFormatter())
 
 
 def test_minorticks_rc():
