matplotlib
diff --git a/‎lib/matplotlib/tests/test_constrainedlayout.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_constrainedlayout.py
+36-4Lines changed: 36 additions & 4 deletions b/‎lib/matplotlib/tests/test_constrainedlayout.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_constrainedlayout.py
+36-4Lines changed: 36 additions & 4 deletions
diff --git a/‎tutorials/intermediate/constrainedlayout_guide.py
Copy file name to clipboardExpand all lines: tutorials/intermediate/constrainedlayout_guide.py
+61-1Lines changed: 61 additions & 1 deletion b/‎tutorials/intermediate/constrainedlayout_guide.py
Copy file name to clipboardExpand all lines: tutorials/intermediate/constrainedlayout_guide.py
+61-1Lines changed: 61 additions & 1 deletion
@@ -20,16 +20,17 @@ def example_plot(ax, fontsize=12, nodec=False):
         ax.set_yticklabels('')
 
 
-def example_pcolor(ax, fontsize=12):
+def example_pcolor(ax, fontsize=12, hide_labels=False):
     dx, dy = 0.6, 0.6
     y, x = np.mgrid[slice(-3, 3 + dy, dy),
                     slice(-3, 3 + dx, dx)]
     z = (1 - x / 2. + x ** 5 + y ** 3) * np.exp(-x ** 2 - y ** 2)
     pcm = ax.pcolormesh(x, y, z[:-1, :-1], cmap='RdBu_r', vmin=-1., vmax=1.,
                         rasterized=True)
-    ax.set_xlabel('x-label', fontsize=fontsize)
-    ax.set_ylabel('y-label', fontsize=fontsize)
-    ax.set_title('Title', fontsize=fontsize)
+    if not hide_labels:
+        ax.set_xlabel('x-label', fontsize=fontsize)
+        ax.set_ylabel('y-label', fontsize=fontsize)
+        ax.set_title('Title', fontsize=fontsize)
     return pcm
 
 
@@ -555,3 +556,34 @@ def test_align_labels():
                                after_align[1].x0, rtol=0, atol=1e-05)
     # ensure labels do not go off the edge
     assert after_align[0].x0 >= 1
+
+
+def test_compressed1():
+    fig, axs = plt.subplots(3, 2, constrained_layout={'compress': True},
+                            sharex=True, sharey=True)
+    for ax in axs.flat:
+        pc = ax.imshow(np.random.randn(20, 20))
+
+    fig.colorbar(pc, ax=axs)
+    fig.draw_no_output()
+
+    pos = axs[0, 0].get_position()
+    np.testing.assert_allclose(pos.x0, 0.2244, atol=1e-3)
+    pos = axs[0, 1].get_position()
+    np.testing.assert_allclose(pos.x1, 0.6925, atol=1e-3)
+
+    # wider than tall
+    fig, axs = plt.subplots(2, 3, constrained_layout={'compress': True},
+                            sharex=True, sharey=True, figsize=(5, 4))
+    for ax in axs.flat:
+        pc = ax.imshow(np.random.randn(20, 20))
+
+    fig.colorbar(pc, ax=axs)
+    fig.draw_no_output()
+
+    pos = axs[0, 0].get_position()
+    np.testing.assert_allclose(pos.x0, 0.06195, atol=1e-3)
+    np.testing.assert_allclose(pos.y1, 0.8413, atol=1e-3)
+    pos = axs[1, 2].get_position()
+    np.testing.assert_allclose(pos.x1, 0.832587, atol=1e-3)
+    np.testing.assert_allclose(pos.y0, 0.205377, atol=1e-3)
@@ -52,6 +52,7 @@
 import matplotlib.pyplot as plt
 import matplotlib.colors as mcolors
 import matplotlib.gridspec as gridspec
+from matplotlib.tests.test_constrainedlayout import example_pcolor
 import numpy as np
 
 plt.rcParams['savefig.facecolor'] = "0.8"
@@ -230,8 +231,67 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 #    :align: center
 #
 
+##############################################################################
+# Grids of fixed-aspect axes
+# ==========================
+# 
+# Often we want to layout axes with fixed-aspect ratios. This adds an extra 
+# constraint to the layout problem, which by default is solved by leaving 
+# one dimension with large white space between axes:
+
+fig, axs = plt.subplots(2, 2, constrained_layout=True, figsize=(6, 3))
+for ax in axs.flat:
+    pc = example_pcolor(ax, hide_labels=True)
+    ax.set_aspect(1)
+fig.colorbar(pc, ax=axs)
+fig.suptitle('Fixed-aspect axes')
+
+##################################
+# Now, we could change the size of the figure manually to improve the 
+# whitespace, but that requires manual intervention.  
+# To address this, we can set ``constrained_layout`` to "compress" the 
+# axes:
+fig, axs = plt.subplots(2, 2, constrained_layout={'compress':True}, 
+                        figsize=(6, 3), sharex=True, sharey=True)
+for ax in axs.flat:
+    pc = example_pcolor(ax, hide_labels=True)
+    ax.set_aspect(1)
+fig.colorbar(pc, ax=axs)
+fig.suptitle('Fixed-aspect axes')
+
+###################################
+# Note this works in the vertical direction as well, though the 
+# suptitle stays at the top of the plot:
+fig, axs = plt.subplots(2, 2, constrained_layout={'compress':True}, 
+                        figsize=(3, 5), sharex=True, sharey=True)
+for ax in axs.flat:
+    pc = example_pcolor(ax, hide_labels=True)
+    ax.set_aspect(1)
+fig.colorbar(pc, ax=axs)
+fig.suptitle('Fixed-aspect axes')
+
+###################################
+# Note if only one row of axes have a fixed aspect, there can still be
+# the need for manually adjusting the figure size, however, in this case
+# widening the figure will make the layout look good again (not shown here)
+
+fig, axs = plt.subplots(2, 2, constrained_layout={'compress':True}, 
+                        figsize=(4, 6), sharex=True, sharey=True)
+for i in range(2):
+    for j in range(2):
+        ax = axs[i, j]
+        pc = example_pcolor(ax, hide_labels=True)
+        if i == 0:
+            ax.set_title('asp=1')
+            ax.set_aspect(1)
+        else:
+            ax.set_title('asp="auto"')
+fig.colorbar(pc, ax=axs)
+fig.suptitle('Fixed-aspect axes')
+plt.show()
+
 ###############################################################################
-# Padding and Spacing
+# Padding and spacing
 # ===================
 #
 # Padding between axes is controlled in the horizontal by *w_pad* and