Skip to content

Commit 1c27984

Browse files
committed
Merge branch 'v2.x'
2 parents 0db1152 + 7bc3ca1 commit 1c27984

File tree

11 files changed

+10
-3
lines changed

11 files changed

+10
-3
lines changed

lib/matplotlib/rcsetup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,7 @@ def validate_animation_writer_path(p):
11561156
'figure.titleweight': ['normal', six.text_type],
11571157

11581158
# figure size in inches: width by height
1159-
'figure.figsize': [[8.0, 6.0], validate_nseq_float(2)],
1159+
'figure.figsize': [[6.4, 4.8], validate_nseq_float(2)],
11601160
'figure.dpi': [100, validate_float], # DPI
11611161
'figure.facecolor': ['w', validate_color], # facecolor; white
11621162
'figure.edgecolor': ['w', validate_color], # edgecolor; white
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

lib/matplotlib/tests/test_backend_pgf.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
import matplotlib.pyplot as plt
1616
from matplotlib.compat import subprocess
1717
from matplotlib.testing.compare import compare_images, ImageComparisonFailure
18-
from matplotlib.testing.decorators import _image_directories, switch_backend
18+
from matplotlib.testing.decorators import (_image_directories, switch_backend,
19+
cleanup)
1920

2021

2122
baseline_dir, result_dir = _image_directories(lambda: 'dummy func')
@@ -79,6 +80,7 @@ def create_figure():
7980

8081

8182
# test compiling a figure to pdf with xelatex
83+
@cleanup(style='classic')
8284
@switch_backend('pgf')
8385
def test_xelatex():
8486
if not check_for('xelatex'):
@@ -92,6 +94,7 @@ def test_xelatex():
9294

9395

9496
# test compiling a figure to pdf with pdflatex
97+
@cleanup(style='classic')
9598
@switch_backend('pgf')
9699
def test_pdflatex():
97100
if not check_for('pdflatex'):
@@ -108,6 +111,7 @@ def test_pdflatex():
108111

109112

110113
# test updating the rc parameters for each figure
114+
@cleanup(style='classic')
111115
@switch_backend('pgf')
112116
def test_rcupdate():
113117
if not check_for('xelatex') or not check_for('pdflatex'):
@@ -137,6 +141,7 @@ def test_rcupdate():
137141

138142

139143
# test backend-side clipping, since large numbers are not supported by TeX
144+
@cleanup(style='classic')
140145
@switch_backend('pgf')
141146
def test_pathclip():
142147
if not check_for('xelatex'):
@@ -155,6 +160,7 @@ def test_pathclip():
155160

156161

157162
# test mixed mode rendering
163+
@cleanup(style='classic')
158164
@switch_backend('pgf')
159165
def test_mixedmode():
160166
if not check_for('xelatex'):
@@ -171,6 +177,7 @@ def test_mixedmode():
171177

172178

173179
# test bbox_inches clipping
180+
@cleanup(style='classic')
174181
@switch_backend('pgf')
175182
def test_bbox_inches():
176183
if not check_for('xelatex'):

matplotlibrc.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ backend : $TEMPLATE_BACKEND
418418
# See http://matplotlib.org/api/figure_api.html#matplotlib.figure.Figure
419419
#figure.titlesize : medium # size of the figure title
420420
#figure.titleweight : normal # weight of the figure title
421-
#figure.figsize : 8, 6 # figure size in inches
421+
#figure.figsize : 6.4, 4.8 # figure size in inches
422422
#figure.dpi : 100 # figure dots per inch
423423
#figure.facecolor : white # figure facecolor; 0.75 is scalar gray
424424
#figure.edgecolor : white # figure edgecolor

0 commit comments

Comments
 (0)