Skip to content

Commit 9a63e51

Browse files
tacaswelltacaswell
committed
Merge remote-tracking branch 'matplotlib/v2.x'
The apparent removal of the test_auto_numticks is because it is present at L4235.
2 parents 1446c69 + dcf50b3 commit 9a63e51

File tree

3 files changed

+64
-26
lines changed

3 files changed

+64
-26
lines changed

‎doc/_static/logo2.svg

Lines changed: 48 additions & 16 deletions
Loading

‎lib/matplotlib/tests/test_axes.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2748,7 +2748,7 @@ def test_subplot_key_hash():
27482748

27492749
@image_comparison(baseline_images=['specgram_freqs',
27502750
'specgram_freqs_linear'],
2751-
remove_text=True, extensions=['png'], tol=0.01)
2751+
remove_text=True, extensions=['png'], tol=0.03)
27522752
def test_specgram_freqs():
27532753
'''test axes.specgram in default (psd) mode with sinusoidal stimuli'''
27542754
n = 10000
@@ -2848,7 +2848,7 @@ def test_specgram_noise():
28482848

28492849
@image_comparison(baseline_images=['specgram_magnitude_freqs',
28502850
'specgram_magnitude_freqs_linear'],
2851-
remove_text=True, extensions=['png'], tol=0.01)
2851+
remove_text=True, extensions=['png'], tol=0.03)
28522852
def test_specgram_magnitude_freqs():
28532853
'''test axes.specgram in magnitude mode with sinusoidal stimuli'''
28542854
n = 10000
@@ -4286,6 +4286,12 @@ def test_broken_barh_empty():
42864286
ax.broken_barh([], (.1, .5))
42874287

42884288

4289+
@cleanup
4290+
def test_broken_barh_empty():
4291+
fig, ax = plt.subplots()
4292+
ax.broken_barh([], (.1, .5))
4293+
4294+
42894295
if __name__ == '__main__':
42904296
import nose
42914297
import sys

‎lib/matplotlib/ticker.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1642,17 +1642,17 @@ def view_limits(self, vmin, vmax):
16421642
vmin = b ** (vmax - self.numdecs)
16431643
return vmin, vmax
16441644

1645-
if rcParams['axes.autolimit_mode'] == 'round_numbers':
1646-
minpos = self.axis.get_minpos()
1645+
minpos = self.axis.get_minpos()
16471646

1648-
if minpos <= 0 or not np.isfinite(minpos):
1649-
raise ValueError(
1650-
"Data has no positive values, and therefore can not be "
1651-
"log-scaled.")
1647+
if minpos <= 0 or not np.isfinite(minpos):
1648+
raise ValueError(
1649+
"Data has no positive values, and therefore can not be "
1650+
"log-scaled.")
16521651

1653-
if vmin <= minpos:
1654-
vmin = minpos
1652+
if vmin <= minpos:
1653+
vmin = minpos
16551654

1655+
if rcParams['axes.autolimit_mode'] == 'round_numbers':
16561656
if not is_decade(vmin, self._base):
16571657
vmin = decade_down(vmin, self._base)
16581658
if not is_decade(vmax, self._base):

0 commit comments

Comments
 (0)