8000 Merge branch 'v1.4.x' into master · matplotlib/matplotlib@d84b16e · GitHub
[go: up one dir, main page]

Skip to content

Commit d84b16e

Browse files
committed
Merge branch 'v1.4.x' into master
Conflicts: lib/matplotlib/tests/test_ticker.py src/_backend_agg.cpp test_ticker.py: white space conflicts _backend_agg.cpp: Discarded all changes from v1.4.x due to the massive refactor, test works with out seg-faulting.
2 parents e9b90c7 + 1cf1ab1 commit d84b16e

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

lib/matplotlib/tests/test_agg.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,19 @@ def report_memory(i):
131131
## # w/ text and w/ write_png : Average memory consumed per loop: 0.32
132132

133133

134+
@cleanup
135+
def test_marker_with_nan():
136+
# This creates a marker with nans in it, which was segfaulting the
137+
# Agg backend (see #3722)
138+
fig, ax = plt.subplots(1)
139+
steps = 1000
140+
data = np.arange(steps)
141+
ax.semilogx(data)
142+
ax.fill_between(data, data*0.8, data*1.2)
143+
buf = io.BytesIO()
144+
fig.savefig(buf, format='png')
145+
146+
134147
if __name__ == "__main__":
135148
import nose
136149
nose.runmodule(argv=['-s', '--with-doctest'], exit=False)

lib/matplotlib/tests/test_ticker.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import matplotlib.ticker as mticker
1212
from matplotlib.testing.decorators import cleanup
1313

14+
1415
def test_MaxNLocator():
1516
loc = mticker.MaxNLocator(nbins=5)
1617
test_value = np.array([20., 40., 60., 80., 100.])

0 commit comments

Comments
 (0)
0