From 3e16e712d6e3bc9542a23c20939ea57e20c07b59 Mon Sep 17 00:00:00 2001 From: matt statham Date: Fri, 9 Dec 2022 08:11:04 -0600 Subject: [PATCH 1/3] bug fix inserted issue test runs but fails comparison updated styling in test image bug fix inserted issue test runs but fails comparison formatting fixed long line linter issues --- lib/mpl_toolkits/axes_grid1/inset_locator.py | 3 +- .../anchored_locator_base_call.png | Bin 0 -> 5455 bytes .../axes_grid1/tests/test_axes_grid1.py | 711 +++++++++++++----- 3 files changed, 506 insertions(+), 208 deletions(-) create mode 100644 lib/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/anchored_locator_base_call.png diff --git a/lib/mpl_toolkits/axes_grid1/inset_locator.py b/lib/mpl_toolkits/axes_grid1/inset_locator.py index 103a2157540c..71237f1b2e52 100644 --- a/lib/mpl_toolkits/axes_grid1/inset_locator.py +++ b/lib/mpl_toolkits/axes_grid1/inset_locator.py @@ -73,7 +73,7 @@ def __call__(self, ax, renderer): bbox = self.get_window_extent(renderer) px, py = self.get_offset(bbox.width, bbox.height, 0, 0, renderer) bbox_canvas = Bbox.from_bounds(px, py, bbox.width, bbox.height) - tr = ax.figure.transFigure.inverted() + tr = ax.figure.transSubfigure.inverted() return TransformedBbox(bbox_canvas, tr) @@ -388,7 +388,6 @@ def inset_axes(parent_axes, width, height, loc='upper right', inset_axes : *axes_class* Inset axes object created. """ - if axes_class is None: axes_class = HostAxes if axes_kwargs is None: diff --git a/lib/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/anchored_locator_base_call.png b/lib/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/anchored_locator_base_call.png new file mode 100644 index 0000000000000000000000000000000000000000..4ce2fee7d2ce2cfd43544e5c7c21e68a5059d4b7 GIT binary patch literal 5455 zcmeHLX*8Q{x26M1(N_&sEu~bAF%K#77Hv&MD~Ks5H4{V3L1|U1#Vbn8Lsg9-t*NA@ z`b;%OV-{1*V+|=G;XK|SXPt9?obRmj{W@!%^{i(-YbE!v@4feR?Q7q!jSU~LGGAq; zqoZTh)zN-TM@KJt`Z6&9zXXTH`vV_S zdjl)M`IcEdv4{)G$z|$x8LBA$NIZFR;NxrG-S0e{rg~2b_JrI(<0V+}d#a|o&|*XLnt# zKd4VtluqUbM*uyYvD6usXT0aQ>ExLt>6|XX=z4D8=u+?6(aStdR1 z*64Xj;l?fZpdc6)i``KJt^3L(s4l(JE2wfC62B*usSJJ7oPM{pwRLrKlMR3I3P(am zbqIMC*9~lteixX7E)Qdx7$4UxXV|rnOM?am25!qgU%dpAciEA{VX<+|nx-z`B37RM z|6rO@nd&zw_65j-k%7VOj9zZrgtjMcZf?w123 zvP$lCBCoVXO{o%!hlgK17PIB64KMLf(zlyUVJcIV3+BCIF$t}WR9soqpL@w2=;{08 zj-49+NN4A(;R@S|0)0%Madc{h3-UoxdzQjtIjxo()Uby(E4MDjZ#7z3)p`vj-hALx zpwR<5H;h`Uo8c^05L3Bl<1HSh{@A|Bu%#I7He5{jA|Pd04XbpD%Z@k>&I0?pIWb3G zu;vhg@{Z&(@H}d#D0&8-(DwDw5@B*;*anM{#xEh!Xjmf54cAzD(by zJc>ISIU|u~zyL>hct9N-9Ih1D^S@_h$-BDG_a;f$KQOSgp`k&AyuTk~Ex35O54V^x z*uFkE!7fgUGY+xR5ed$*NRO$Mn0(u;S=3Hji(If}F@3q%vT+Hg4}m!tEjTl1kpsRX*?XNSjA7%${Wd81c^eA+PZIL7;TlH zH-Y|&^4360AsAx~&tcl4AXTp01v_{(9?_i^np0F8XZrX4pj#R|)+um)YGb#w6vVKR z(k_R1Pd)PaddVaYr;{c=KHyd3J|bP`8n6^;lWCtEL|MR)^95)+Sy@@=4^mb&%Y4%Z zFX5=|w!b8-Qg1QK7O==Zb%2FPfrVcaelR3?xs8odR&jw zxvW@YpQo{19gx(;Xqi$Ir?MojvHrQD!pKOS4D|`$Av~=0H|dzw+t&!LLo1bjrtH|< z7meC|_}Y%PaiR>bdDt4d-Ha04w(u6<@{)p~jD9sJdN66c7dM?f>L*ooX55Zwx*UB^ zoReG3JXf9h)ULt7!S^EiDK3tV!Z?(pqqc;3xujK&*UdmLq3K-B#=CVW&#atBIbVdo zzFrC*|NQh#ya0qB7EV3z38Qq|vK5y^OPRcKdq0qCkXLhrGtOZu<492doeB>ln`Wu_ zXbx7}vKnQp6^9-DjPVaqin;`Tvlp|DilujrZZn5eiZfEh- z!UTqLNVBzHr<4hpR$Vg9YcE$VGCDUbg+wBY^7C)5%W;3T))0pXmb!0IOPy3N;?{*9Ud)<_lhxGCBK$0t5c#7uj;zpM!3MMRDzsc_ID&A zDWt5ecb=7n8wPfb67?!F5j!jk`zj5%mE&e=;=y4vb+ka_=|s@jM2y}FT?G1!?d$Ll zU)dl6i68%fRZi(%-{o+IF(uo6;Wi7;t4R>bBCcJIjP~XdQodDOCLeq&No?Z7u;D69 zg-PP|H!3 za4}wNbS(Iu`>)6kV;&SwhPrLEY^h$vSVqZ-?+4U*&=!|yaea(2aa{L03u9!oaWaFM zB70s@brP7Htug+Rc>n%9ms&6vKYc*AC*YOZQyaRcQ{C>0k`MnOBB*H^q6?D(7mtXZ zaW7ZhYX6Zbq3{^cwQX`UwY6 zI6QV<#QZ03ib8i5Q5FQSX0rJg*@ujP3s?YS?lF(_yFCx2yyYdBz3+mue#-IeqI}EAJ>4dhUBf3N?z#7e z4@sYF^Ct9HXz&70v+}{e+PGF5OyKYxA#0BJU?6L_y6)T)GL(kk6H59Qe6L=+29?G* ztOvFNdx@hlLWyIvbFx+Ja>-5J7` z?o1OP$J^}cw7nmd0T+8%`+%aNvw7&J>T6OC_JmNnjD&T!8uq8wub=aaYEE}IR0gY? zyR}NY-T?7JE9WkwSwxH~#jaOZAq7UbQ_7$rCN7Gs>+;@@IRP8Lx;tAmLjkKw6maM+ z#~E^adwXoFaJ~lNCE(~C!^FwB=8{E0PBe0+nO;#*krV)&C9}IWO0}8y^pr=jo#w(3 z8|hW)F~&NB$Fw8zfEGI`VA_4SEUivc76f>(gy>;1j)abxn}{io56S;WtlDI3@Oe%o8cV&u=D|Mg$5uYI=mSyCkB! zHjFiq`~miz ze>IGih%n%G($N4>9(6gRcnz>#{sI|H5lD zUUY^P{XJu$Cry4FXRnp}cS-6~%~B7onNvzLxZefn9nwXurOh*+6<>mlh;Up0 z3Y;X)!&f6w2Riw&sR=T$g~j7Thu5sVeMdly7bKxANV{G~#!($%A#*vl?s=5(V@ggj zK*jm_`E7tEm>%OR(UQ(c>ULUiY1QO1sI@;Goh)I#I(>2+XgAi`sk2?J=f->JC`YC4 zX`8Nrw3D_-s-jzmxi(|#sVJ$(@N?WBoxnJ!&u7<%u~y_B`Tpg>0)5L*Pojla4z_>B zwmp&G8Hj?4i|AfG&iUS2Kum&)7c6vRN&$6nay^U7SG`2EJgCY8WrM@i7 zhLGyR!^6F!=@U3$Xvps|XY#LB_R{KVa(qG)Ab{I``c&7{aQ92E#`zf*L-k6{u#bf~ z2#f-#Tn{BHlsfmD;^Jble=y5V2bWjPIz=ANvPWE5rn|GU$c8(WB)`|k^1Cr0iKH%< zi5kz4pK;1n$d$p8_(X$SLjZgU1VYJ6ox8NTN;&n@^bqG{29QETi|D)Y)5Wt3mb5uP z4Ov}8<17g-RVq}bXOy-*Pgc5BmVc(}|Eci**9V-o4n4^RxAIS@OOV)(pR22@e;4V| zQCQ8?z`$Se{OTo(i%uJ(pR@oh2trwM(e+Ga4ju8XfB^LEbEO@U4*_4Fx}gbBa`jt{ zN3m-S$A@bn^NA0tf_I&OtSk88dR^658$d71rx3cN)j2e-px|D`*PYn=4<7jM%iSrsv*=Lh|nB3hF!o6oHhJ20V1s%dp|#9r%RMPY=u~vYkQMNWW7-&eWny`QfRoc zn{$HlIsVVcsrwU0&tzm%WuJTs9l? zVR=ek>}tRM9Bb6?#{vB5oD=pjKAtT&J5UsXeeWn&yt(Oh3XAIM-h*Rj7JrOipIEY< z>rjblEmc!n^@lUe#>NInh7vbYOUvEU@Iww-*uQ_%L)UnbN}RKU?_;EG24lG-gmpU- z1k5G5O@KC{Elf#CDTUNs4WJ`^sufvPU7dE=nxjp+n`tprF8!XCpP(`Ldt;*7=jVOe zULj-%VD&diTSw>*S$6{6$g4xEYilMNIp#u%1C{+6r7;5Gr|qm@(^)$7wtSfz>&1&M zE-pG+T3Uy5JWW@EHg*=eE$flRSNZtJ?R*HA{%rNtLV)hky9Is_uh;`o%OKL4iN0D2}s zQm>6vfbi-f8NI7OTZECeZ7i!mElAWaWruzf`#h!E6Uwe}kn8T@fkaz}hK9EJ!$UU| zM~KAv#^2Qyb)j1gBR~s?XW^0V@yrvEOM5#}=U2G4yzD(uiwFd&Kmg=~(yxUrM)TOB z2qgaz8$)!`{PFMFrt@$CUS1z{b@k0n{8j)E`e$$2o@@p-9oeX~4Xd8%eg>hf7;R!} zr+kedG-O+Iz3)P-I|30%qtW_Qmv$&$Pd7RO7E

X1ESUc1qbcPKE&x0{%73RGEEG zC^}k#obbBY6fiI_Om>5s)(x}3rm{Hxu)Rkk6BBFg9UWPIeGR|9u}E{jsY}o}y#2y$ zjW6>>>>>> 955967cb46... formatting +======= +import matplotlib as mpl +import matplotlib.pyplot as plt +import matplotlib.ticker as mticker +from matplotlib import cbook +from matplotlib.backend_bases import MouseEvent +from matplotlib.colors import LogNorm +from matplotlib.testing.decorators import ( + check_figures_equal, + image_comparison, + remove_ticks_and_titles, +) +from matplotlib.transforms import Bbox, TransformedBbox +>>>>>>> 6d992cad91... fixed long line linter issues def test_divider_append_axes(): @@ -38,9 +79,13 @@ def test_divider_append_axes(): axs = { "main": ax, "top": divider.append_axes("top", 1.2, pad=0.1, sharex=ax), - "bottom": divider.append_axes("bottom", 1.2, pad=0.1, sharex=ax), + "bottom": divider.append_axes( + "bottom", 1.2, pad=0.1, sharex=ax + ), "left": divider.append_axes("left", 1.2, pad=0.1, sharey=ax), - "right": divider.append_axes("right", 1.2, pad=0.1, sharey=ax), + "right": divider.append_axes( + "right", 1.2, pad=0.1, sharey=ax + ), } fig.canvas.draw() bboxes = {k: axs[k].get_window_extent() for k in axs} @@ -49,34 +94,66 @@ def test_divider_append_axes(): assert bboxes["bottom"].height == pytest.approx(1.2 * dpi) assert bboxes["left"].width == pytest.approx(1.2 * dpi) assert bboxes["right"].width == pytest.approx(1.2 * dpi) - assert bboxes["top"].y0 - bboxes["main"].y1 == pytest.approx(0.1 * dpi) - assert bboxes["main"].y0 - bboxes["bottom"].y1 == pytest.approx(0.1 * dpi) - assert bboxes["main"].x0 - bboxes["left"].x1 == pytest.approx(0.1 * dpi) - assert bboxes["right"].x0 - bboxes["main"].x1 == pytest.approx(0.1 * dpi) - assert bboxes["left"].y0 == bboxes["main"].y0 == bboxes["right"].y0 - assert bboxes["left"].y1 == bboxes["main"].y1 == bboxes["right"].y1 - assert bboxes["top"].x0 == bboxes["main"].x0 == bboxes["bottom"].x0 - assert bboxes["top"].x1 == bboxes["main"].x1 == bboxes["bottom"].x1 + assert bboxes["top"].y0 - bboxes["main"].y1 == pytest.approx( + 0.1 * dpi + ) + assert bboxes["main"].y0 - bboxes["bottom"].y1 == pytest.approx( + 0.1 * dpi + ) + assert bboxes["main"].x0 - bboxes["left"].x1 == pytest.approx( + 0.1 * dpi + ) + assert bboxes["right"].x0 - bboxes["main"].x1 == pytest.approx( + 0.1 * dpi + ) + assert ( + bboxes["left"].y0 == bboxes["main"].y0 == bboxes["right"].y0 + ) + assert ( + bboxes["left"].y1 == bboxes["main"].y1 == bboxes["right"].y1 + ) + assert ( + bboxes["top"].x0 == bboxes["main"].x0 == bboxes["bottom"].x0 + ) + assert ( + bboxes["top"].x1 == bboxes["main"].x1 == bboxes["bottom"].x1 + ) # Update style when regenerating the test image -@image_comparison(['twin_axes_empty_and_removed'], extensions=["png"], tol=1, - style=('classic', '_classic_test_patch')) +@image_comparison( + ["twin_axes_empty_and_removed"], + extensions=["png"], + tol=1, + style=("classic", "_classic_test_patch"), +) def test_twin_axes_empty_and_removed(): # Purely cosmetic font changes (avoid overlap) mpl.rcParams.update( - {"font.size": 8, "xtick.labelsize": 8, "ytick.labelsize": 8}) + {"font.size": 8, "xtick.labelsize": 8, "ytick.labelsize": 8} + ) generators = ["twinx", "twiny", "twin"] - modifiers = ["", "host invisible", "twin removed", "twin invisible", - "twin removed\nhost invisible"] + modifiers = [ + "", + "host invisible", + "twin removed", + "twin invisible", + "twin removed\nhost invisible", + ] # Unmodified host subplot at the beginning for reference - h = host_subplot(len(modifiers)+1, len(generators), 2) - h.text(0.5, 0.5, "host_subplot", - horizontalalignment="center", verticalalignment="center") + h = host_subplot(len(modifiers) + 1, len(generators), 2) + h.text( + 0.5, + 0.5, + "host_subplot", + horizontalalignment="center", + verticalalignment="center", + ) # Host subplots with various modifications (twin*, visibility) applied - for i, (mod, gen) in enumerate(product(modifiers, generators), - len(generators) + 1): - h = host_subplot(len(modifiers)+1, len(generators), i) + for i, (mod, gen) in enumerate( + product(modifiers, generators), len(generators) + 1 + ): + h = host_subplot(len(modifiers) + 1, len(generators), i) t = getattr(h, gen)() if "twin invisible" in mod: t.axis[:].set_visible(False) @@ -84,20 +161,27 @@ def test_twin_axes_empty_and_removed(): t.remove() if "host invisible" in mod: h.axis[:].set_visible(False) - h.text(0.5, 0.5, gen + ("\n" + mod if mod else ""), - horizontalalignment="center", verticalalignment="center") + h.text( + 0.5, + 0.5, + gen + ("\n" + mod if mod else ""), + horizontalalignment="center", + verticalalignment="center", + ) plt.subplots_adjust(wspace=0.5, hspace=1) def test_axesgrid_colorbar_log_smoketest(): fig = plt.figure() - grid = AxesGrid(fig, 111, # modified to be only subplot - nrows_ncols=(1, 1), - ngrids=1, - label_mode="L", - cbar_location="top", - cbar_mode="single", - ) + grid = AxesGrid( + fig, + 111, # modified to be only subplot + nrows_ncols=(1, 1), + ngrids=1, + label_mode="L", + cbar_location="top", + cbar_mode="single", + ) Z = 10000 * np.random.rand(10, 10) im = grid[0].imshow(Z, interpolation="nearest", norm=LogNorm()) @@ -117,24 +201,30 @@ def test_inset_colorbar_tight_layout_smoketest(): plt.tight_layout() -@image_comparison(['inset_locator.png'], style='default', remove_text=True) +@image_comparison( + ["inset_locator.png"], style="default", remove_text=True +) def test_inset_locator(): fig, ax = plt.subplots(figsize=[5, 4]) # prepare the demo image # Z is a 15x15 array - Z = cbook.get_sample_data("axes_grid/bivariate_normal.npy", np_load=True) + Z = cbook.get_sample_data( + "axes_grid/bivariate_normal.npy", np_load=True + ) extent = (-3, 4, -4, 3) Z2 = np.zeros((150, 150)) ny, nx = Z.shape - Z2[30:30+ny, 30:30+nx] = Z + Z2[30 : 30 + ny, 30 : 30 + nx] = Z - ax.imshow(Z2, extent=extent, interpolation="nearest", - origin="lower") + ax.imshow( + Z2, extent=extent, interpolation="nearest", origin="lower" + ) - axins = zoomed_inset_axes(ax, zoom=6, loc='upper right') - axins.imshow(Z2, extent=extent, interpolation="nearest", - origin="lower") + axins = zoomed_inset_axes(ax, zoom=6, loc="upper right") + axins.imshow( + Z2, extent=extent, interpolation="nearest", origin="lower" + ) axins.yaxis.get_major_locator().set_params(nbins=7) axins.xaxis.get_major_locator().set_params(nbins=7) # sub region of the original image @@ -149,36 +239,51 @@ def test_inset_locator(): # connecting lines between the bbox and the inset axes area mark_inset(ax, axins, loc1=2, loc2=4, fc="none", ec="0.5") - asb = AnchoredSizeBar(ax.transData, - 0.5, - '0.5', - loc='lower center', - pad=0.1, borderpad=0.5, sep=5, - frameon=False) + asb = AnchoredSizeBar( + ax.transData, + 0.5, + "0.5", + loc="lower center", + pad=0.1, + borderpad=0.5, + sep=5, + frameon=False, + ) ax.add_artist(asb) -@image_comparison(['inset_axes.png'], style='default', remove_text=True) +@image_comparison( + ["inset_axes.png"], style="default", remove_text=True +) def test_inset_axes(): fig, ax = plt.subplots(figsize=[5, 4]) # prepare the demo image # Z is a 15x15 array - Z = cbook.get_sample_data("axes_grid/bivariate_normal.npy", np_load=True) + Z = cbook.get_sample_data( + "axes_grid/bivariate_normal.npy", np_load=True + ) extent = (-3, 4, -4, 3) Z2 = np.zeros((150, 150)) ny, nx = Z.shape - Z2[30:30+ny, 30:30+nx] = Z + Z2[30 : 30 + ny, 30 : 30 + nx] = Z - ax.imshow(Z2, extent=extent, interpolation="nearest", - origin="lower") + ax.imshow( + Z2, extent=extent, interpolation="nearest", origin="lower" + ) # creating our inset axes with a bbox_transform parameter - axins = inset_axes(ax, width=1., height=1., bbox_to_anchor=(1, 1), - bbox_transform=ax.transAxes) - - axins.imshow(Z2, extent=extent, interpolation="nearest", - origin="lower") + axins = inset_axes( + ax, + width=1.0, + height=1.0, + bbox_to_anchor=(1, 1), + bbox_transform=ax.transAxes, + ) + + axins.imshow( + Z2, extent=extent, interpolation="nearest", origin="lower" + ) axins.yaxis.get_major_locator().set_params(nbins=7) axins.xaxis.get_major_locator().set_params(nbins=7) # sub region of the original image @@ -193,12 +298,16 @@ def test_inset_axes(): # connecting lines between the bbox and the inset axes area mark_inset(ax, axins, loc1=2, loc2=4, fc="none", ec="0.5") - asb = AnchoredSizeBar(ax.transData, - 0.5, - '0.5', - loc='lower center', - pad=0.1, borderpad=0.5, sep=5, - frameon=False) + asb = AnchoredSizeBar( + ax.transData, + 0.5, + "0.5", + loc="lower center", + pad=0.1, + borderpad=0.5, + sep=5, + frameon=False, + ) ax.add_artist(asb) @@ -206,46 +315,77 @@ def test_inset_axes_complete(): dpi = 100 figsize = (6, 5) fig, ax = plt.subplots(figsize=figsize, dpi=dpi) - fig.subplots_adjust(.1, .1, .9, .9) + fig.subplots_adjust(0.1, 0.1, 0.9, 0.9) - ins = inset_axes(ax, width=2., height=2., borderpad=0) + ins = inset_axes(ax, width=2.0, height=2.0, borderpad=0) fig.canvas.draw() assert_array_almost_equal( ins.get_position().extents, - [(0.9*figsize[0]-2.)/figsize[0], (0.9*figsize[1]-2.)/figsize[1], - 0.9, 0.9]) + [ + (0.9 * figsize[0] - 2.0) / figsize[0], + (0.9 * figsize[1] - 2.0) / figsize[1], + 0.9, + 0.9, + ], + ) ins = inset_axes(ax, width="40%", height="30%", borderpad=0) fig.canvas.draw() assert_array_almost_equal( - ins.get_position().extents, [.9-.8*.4, .9-.8*.3, 0.9, 0.9]) - - ins = inset_axes(ax, width=1., height=1.2, bbox_to_anchor=(200, 100), - loc=3, borderpad=0) + ins.get_position().extents, + [0.9 - 0.8 * 0.4, 0.9 - 0.8 * 0.3, 0.9, 0.9], + ) + + ins = inset_axes( + ax, + width=1.0, + height=1.2, + bbox_to_anchor=(200, 100), + loc=3, + borderpad=0, + ) fig.canvas.draw() assert_array_almost_equal( ins.get_position().extents, - [200/dpi/figsize[0], 100/dpi/figsize[1], - (200/dpi+1)/figsize[0], (100/dpi+1.2)/figsize[1]]) - - ins1 = inset_axes(ax, width="35%", height="60%", loc=3, borderpad=1) - ins2 = inset_axes(ax, width="100%", height="100%", - bbox_to_anchor=(0, 0, .35, .60), - bbox_transform=ax.transAxes, loc=3, borderpad=1) + [ + 200 / dpi / figsize[0], + 100 / dpi / figsize[1], + (200 / dpi + 1) / figsize[0], + (100 / dpi + 1.2) / figsize[1], + ], + ) + + ins1 = inset_axes( + ax, width="35%", height="60%", loc=3, borderpad=1 + ) + ins2 = inset_axes( + ax, + width="100%", + height="100%", + bbox_to_anchor=(0, 0, 0.35, 0.60), + bbox_transform=ax.transAxes, + loc=3, + borderpad=1, + ) fig.canvas.draw() - assert_array_equal(ins1.get_position().extents, - ins2.get_position().extents) + assert_array_equal( + ins1.get_position().extents, ins2.get_position().extents + ) with pytest.raises(ValueError): - ins = inset_axes(ax, width="40%", height="30%", - bbox_to_anchor=(0.4, 0.5)) + ins = inset_axes( + ax, width="40%", height="30%", bbox_to_anchor=(0.4, 0.5) + ) with pytest.warns(UserWarning): - ins = inset_axes(ax, width="40%", height="30%", - bbox_transform=ax.transAxes) + ins = inset_axes( + ax, width="40%", height="30%", bbox_transform=ax.transAxes + ) -@image_comparison(['fill_facecolor.png'], remove_text=True, style='mpl20') +@image_comparison( + ["fill_facecolor.png"], remove_text=True, style="mpl20" +) def test_fill_facecolor(): fig, ax = plt.subplots(1, 5) fig.set_size_inches(5, 5) @@ -259,12 +399,19 @@ def test_fill_facecolor(): bbox2 = TransformedBbox(bbox, ax[1].transData) # set color to BboxConnectorPatch p = BboxConnectorPatch( - bbox1, bbox2, loc1a=1, loc2a=2, loc1b=4, loc2b=3, - ec="r", fc="b") + bbox1, + bbox2, + loc1a=1, + loc2a=2, + loc1b=4, + loc2b=3, + ec="r", + fc="b", + ) p.set_clip_on(False) ax[0].add_patch(p) # set color to marked area - axins = zoomed_inset_axes(ax[0], 1, loc='upper right') + axins = zoomed_inset_axes(ax[0], 1, loc="upper right") axins.set_xlim(0, 0.2) axins.set_ylim(0, 0.2) plt.gca().axes.xaxis.set_ticks([]) @@ -276,12 +423,19 @@ def test_fill_facecolor(): bbox4 = TransformedBbox(bbox, ax[2].transData) # set color to BboxConnectorPatch p = BboxConnectorPatch( - bbox3, bbox4, loc1a=1, loc2a=2, loc1b=4, loc2b=3, - ec="r", facecolor="y") + bbox3, + bbox4, + loc1a=1, + loc2a=2, + loc1b=4, + loc2b=3, + ec="r", + facecolor="y", + ) p.set_clip_on(False) ax[1].add_patch(p) # set color to marked area - axins = zoomed_inset_axes(ax[1], 1, loc='upper right') + axins = zoomed_inset_axes(ax[1], 1, loc="upper right") axins.set_xlim(0, 0.2) axins.set_ylim(0, 0.2) plt.gca().axes.xaxis.set_ticks([]) @@ -293,12 +447,19 @@ def test_fill_facecolor(): bbox6 = TransformedBbox(bbox, ax[3].transData) # set color to BboxConnectorPatch p = BboxConnectorPatch( - bbox5, bbox6, loc1a=1, loc2a=2, loc1b=4, loc2b=3, - ec="r", color="g") + bbox5, + bbox6, + loc1a=1, + loc2a=2, + loc1b=4, + loc2b=3, + ec="r", + color="g", + ) p.set_clip_on(False) ax[2].add_patch(p) # set color to marked area - axins = zoomed_inset_axes(ax[2], 1, loc='upper right') + axins = zoomed_inset_axes(ax[2], 1, loc="upper right") axins.set_xlim(0, 0.2) axins.set_ylim(0, 0.2) plt.gca().axes.xaxis.set_ticks([]) @@ -310,60 +471,89 @@ def test_fill_facecolor(): bbox8 = TransformedBbox(bbox, ax[4].transData) # BboxConnectorPatch won't show green p = BboxConnectorPatch( - bbox7, bbox8, loc1a=1, loc2a=2, loc1b=4, loc2b=3, - ec="r", fc="g", fill=False) + bbox7, + bbox8, + loc1a=1, + loc2a=2, + loc1b=4, + loc2b=3, + ec="r", + fc="g", + fill=False, + ) p.set_clip_on(False) ax[3].add_patch(p) # marked area won't show green - axins = zoomed_inset_axes(ax[3], 1, loc='upper right') + axins = zoomed_inset_axes(ax[3], 1, loc="upper right") axins.set_xlim(0, 0.2) axins.set_ylim(0, 0.2) axins.xaxis.set_ticks([]) axins.yaxis.set_ticks([]) - mark_inset(ax[3], axins, loc1=2, loc2=4, fc="g", ec="0.5", fill=False) + mark_inset( + ax[3], axins, loc1=2, loc2=4, fc="g", ec="0.5", fill=False + ) # Update style when regenerating the test image -@image_comparison(['zoomed_axes.png', 'inverted_zoomed_axes.png'], - style=('classic', '_classic_test_patch')) +@image_comparison( + ["zoomed_axes.png", "inverted_zoomed_axes.png"], + style=("classic", "_classic_test_patch"), +) def test_zooming_with_inverted_axes(): fig, ax = plt.subplots() ax.plot([1, 2, 3], [1, 2, 3]) ax.axis([1, 3, 1, 3]) - inset_ax = zoomed_inset_axes(ax, zoom=2.5, loc='lower right') + inset_ax = zoomed_inset_axes(ax, zoom=2.5, loc="lower right") inset_ax.axis([1.1, 1.4, 1.1, 1.4]) fig, ax = plt.subplots() ax.plot([1, 2, 3], [1, 2, 3]) ax.axis([3, 1, 3, 1]) - inset_ax = zoomed_inset_axes(ax, zoom=2.5, loc='lower right') + inset_ax = zoomed_inset_axes(ax, zoom=2.5, loc="lower right") inset_ax.axis([1.4, 1.1, 1.4, 1.1]) # Update style when regenerating the test image -@image_comparison(['anchored_direction_arrows.png'], - tol=0 if platform.machine() == 'x86_64' else 0.01, - style=('classic', '_classic_test_patch')) +@image_comparison( + ["anchored_direction_arrows.png"], + tol=0 if platform.machine() == "x86_64" else 0.01, + style=("classic", "_classic_test_patch"), +) def test_anchored_direction_arrows(): fig, ax = plt.subplots() - ax.imshow(np.zeros((10, 10)), interpolation='nearest') + ax.imshow(np.zeros((10, 10)), interpolation="nearest") - simple_arrow = AnchoredDirectionArrows(ax.transAxes, 'X', 'Y') + simple_arrow = AnchoredDirectionArrows(ax.transAxes, "X", "Y") ax.add_artist(simple_arrow) # Update style when regenerating the test image -@image_comparison(['anchored_direction_arrows_many_args.png'], - style=('classic', '_classic_test_patch')) +@image_comparison( + ["anchored_direction_arrows_many_args.png"], + style=("classic", "_classic_test_patch"), +) def test_anchored_direction_arrows_many_args(): fig, ax = plt.subplots() ax.imshow(np.ones((10, 10))) direction_arrows = AnchoredDirectionArrows( - ax.transAxes, 'A', 'B', loc='upper right', color='red', - aspect_ratio=-0.5, pad=0.6, borderpad=2, frameon=True, alpha=0.7, - sep_x=-0.06, sep_y=-0.08, back_length=0.1, head_width=9, - head_length=10, tail_width=5) + ax.transAxes, + "A", + "B", + loc="upper right", + color="red", + aspect_ratio=-0.5, + pad=0.6, + borderpad=2, + frameon=True, + alpha=0.7, + sep_x=-0.06, + sep_y=-0.08, + back_length=0.1, + head_width=9, + head_length=10, + tail_width=5, + ) ax.add_artist(direction_arrows) @@ -371,49 +561,73 @@ def test_axes_locatable_position(): fig, ax = plt.subplots() divider = make_axes_locatable(ax) with mpl.rc_context({"figure.subplot.wspace": 0.02}): - cax = divider.append_axes('right', size='5%') + cax = divider.append_axes("right", size="5%") fig.canvas.draw() - assert np.isclose(cax.get_position(original=False).width, - 0.03621495327102808) + assert np.isclose( + cax.get_position(original=False).width, 0.03621495327102808 + ) -@image_comparison(['image_grid_each_left_label_mode_all.png'], style='mpl20', - savefig_kwarg={'bbox_inches': 'tight'}) +@image_comparison( + ["image_grid_each_left_label_mode_all.png"], + style="mpl20", + savefig_kwarg={"bbox_inches": "tight"}, +) def test_image_grid_each_left_label_mode_all(): imdata = np.arange(100).reshape((10, 10)) fig = plt.figure(1, (3, 3)) - grid = ImageGrid(fig, (1, 1, 1), nrows_ncols=(3, 2), axes_pad=(0.5, 0.3), - cbar_mode="each", cbar_location="left", cbar_size="15%", - label_mode="all") + grid = ImageGrid( + fig, + (1, 1, 1), + nrows_ncols=(3, 2), + axes_pad=(0.5, 0.3), + cbar_mode="each", + cbar_location="left", + cbar_size="15%", + label_mode="all", + ) # 3-tuple rect => SubplotDivider assert isinstance(grid.get_divider(), SubplotDivider) assert grid.get_axes_pad() == (0.5, 0.3) assert grid.get_aspect() # True by default for ImageGrid for ax, cax in zip(grid, grid.cbar_axes): - im = ax.imshow(imdata, interpolation='none') + im = ax.imshow(imdata, interpolation="none") cax.colorbar(im) -@image_comparison(['image_grid_single_bottom_label_mode_1.png'], style='mpl20', - savefig_kwarg={'bbox_inches': 'tight'}) +@image_comparison( + ["image_grid_single_bottom_label_mode_1.png"], + style="mpl20", + savefig_kwarg={"bbox_inches": "tight"}, +) def test_image_grid_single_bottom(): imdata = np.arange(100).reshape((10, 10)) fig = plt.figure(1, (2.5, 1.5)) - grid = ImageGrid(fig, (0, 0, 1, 1), nrows_ncols=(1, 3), - axes_pad=(0.2, 0.15), cbar_mode="single", - cbar_location="bottom", cbar_size="10%", label_mode="1") + grid = ImageGrid( + fig, + (0, 0, 1, 1), + nrows_ncols=(1, 3), + axes_pad=(0.2, 0.15), + cbar_mode="single", + cbar_location="bottom", + cbar_size="10%", + label_mode="1", + ) # 4-tuple rect => Divider, isinstance will give True for SubplotDivider assert type(grid.get_divider()) is Divider for i in range(3): - im = grid[i].imshow(imdata, interpolation='none') + im = grid[i].imshow(imdata, interpolation="none") grid.cbar_axes[0].colorbar(im) -@image_comparison(['image_grid.png'], - remove_text=True, style='mpl20', - savefig_kwarg={'bbox_inches': 'tight'}) +@image_comparison( + ["image_grid.png"], + remove_text=True, + style="mpl20", + savefig_kwarg={"bbox_inches": "tight"}, +) def test_image_grid(): # test that image grid works with bbox_inches=tight. im = np.arange(100).reshape((10, 10)) @@ -422,34 +636,40 @@ def test_image_grid(): grid = ImageGrid(fig, 111, nrows_ncols=(2, 2), axes_pad=0.1) assert grid.get_axes_pad() == (0.1, 0.1) for i in range(4): - grid[i].imshow(im, interpolation='nearest') + grid[i].imshow(im, interpolation="nearest") def test_gettightbbox(): fig, ax = plt.subplots(figsize=(8, 6)) - l, = ax.plot([1, 2, 3], [0, 1, 0]) + (l,) = ax.plot([1, 2, 3], [0, 1, 0]) ax_zoom = zoomed_inset_axes(ax, 4) ax_zoom.plot([1, 2, 3], [0, 1, 0]) - mark_inset(ax, ax_zoom, loc1=1, loc2=3, fc="none", ec='0.3') + mark_inset(ax, ax_zoom, loc1=1, loc2=3, fc="none", ec="0.3") remove_ticks_and_titles(fig) bbox = fig.get_tightbbox(fig.canvas.get_renderer()) - np.testing.assert_array_almost_equal(bbox.extents, - [-17.7, -13.9, 7.2, 5.4]) + np.testing.assert_array_almost_equal( + bbox.extents, [-17.7, -13.9, 7.2, 5.4] + ) @pytest.mark.parametrize("click_on", ["big", "small"]) -@pytest.mark.parametrize("big_on_axes,small_on_axes", [ - ("gca", "gca"), - ("host", "host"), - ("host", "parasite"), - ("parasite", "host"), - ("parasite", "parasite") -]) -def test_picking_callbacks_overlap(big_on_axes, small_on_axes, click_on): +@pytest.mark.parametrize( + "big_on_axes,small_on_axes", + [ + ("gca", "gca"), + ("host", "host"), + ("host", "parasite"), + ("parasite", "host"), + ("parasite", "parasite"), + ], +) +def test_picking_callbacks_overlap( + big_on_axes, small_on_axes, click_on +): """Test pick events on normal, host or parasite axes.""" # Two rectangles are drawn and "clicked on", a small one and a big one # enclosing the small one. The axis on which they are drawn as well as the @@ -458,19 +678,26 @@ def test_picking_callbacks_overlap(big_on_axes, small_on_axes, click_on): # small one and only the big one is picked if we click on the big one. # Also tests picking on normal axes ("gca") as a control. big = plt.Rectangle((0.25, 0.25), 0.5, 0.5, picker=5) - small = plt.Rectangle((0.4, 0.4), 0.2, 0.2, facecolor="r", picker=5) + small = plt.Rectangle( + (0.4, 0.4), 0.2, 0.2, facecolor="r", picker=5 + ) # Machinery for "receiving" events received_events = [] + def on_pick(event): received_events.append(event) - plt.gcf().canvas.mpl_connect('pick_event', on_pick) + + plt.gcf().canvas.mpl_connect("pick_event", on_pick) # Shortcut rectangles_on_axes = (big_on_axes, small_on_axes) # Axes setup axes = {"gca": None, "host": None, "parasite": None} if "gca" in rectangles_on_axes: axes["gca"] = plt.gca() - if "host" in rectangles_on_axes or "parasite" in rectangles_on_axes: + if ( + "host" in rectangles_on_axes + or "parasite" in rectangles_on_axes + ): axes["host"] = host_subplot(111) axes["parasite"] = axes["host"].twin() # Add rectangles to axes @@ -487,8 +714,9 @@ def on_pick(event): if click_axes is axes["parasite"]: click_axes = axes["host"] (x, y) = click_axes.transAxes.transform(axes_coords) - m = MouseEvent("button_press_event", click_axes.figure.canvas, x, y, - button=1) + m = MouseEvent( + "button_press_event", click_axes.figure.canvas, x, y, button=1 + ) click_axes.pick(m) # Checks expected_n_events = 2 if click_on == "small" else 1 @@ -509,9 +737,15 @@ def test_hbox_divider(): pad = 0.5 # inches. divider = HBoxDivider( - fig, 111, # Position of combined axes. - horizontal=[Size.AxesX(ax1), Size.Fixed(pad), Size.AxesX(ax2)], - vertical=[Size.AxesY(ax1), Size.Scaled(1), Size.AxesY(ax2)]) + fig, + 111, # Position of combined axes. + horizontal=[ + Size.AxesX(ax1), + Size.Fixed(pad), + Size.AxesX(ax2), + ], + vertical=[Size.AxesY(ax1), Size.Scaled(1), Size.AxesY(ax2)], + ) ax1.set_axes_locator(divider.new_locator(0)) ax2.set_axes_locator(divider.new_locator(2)) @@ -532,9 +766,11 @@ def test_vbox_divider(): pad = 0.5 # inches. divider = VBoxDivider( - fig, 111, # Position of combined axes. + fig, + 111, # Position of combined axes. horizontal=[Size.AxesX(ax1), Size.Scaled(1), Size.AxesX(ax2)], - vertical=[Size.AxesY(ax1), Size.Fixed(pad), Size.AxesY(ax2)]) + vertical=[Size.AxesY(ax1), Size.Fixed(pad), Size.AxesY(ax2)], + ) ax1.set_axes_locator(divider.new_locator(0)) ax2.set_axes_locator(divider.new_locator(2)) @@ -563,7 +799,7 @@ def test_grid_axes_lists(): assert_array_equal(grid, np.ravel(grid.axes_column), "column") -@pytest.mark.parametrize('direction', ('row', 'column')) +@pytest.mark.parametrize("direction", ("row", "column")) def test_grid_axes_position(direction): """Test positioning of the axes in Grid.""" fig = plt.figure() @@ -574,27 +810,38 @@ def test_grid_axes_position(direction): assert loc[3]._nx == loc[1]._nx and loc[3]._ny == loc[2]._ny -@pytest.mark.parametrize('rect, ngrids, error, message', ( - ((1, 1), None, TypeError, "Incorrect rect format"), - (111, -1, ValueError, "ngrids must be positive"), - (111, 7, ValueError, "ngrids must be positive"), -)) +@pytest.mark.parametrize( + "rect, ngrids, error, message", + ( + ((1, 1), None, TypeError, "Incorrect rect format"), + (111, -1, ValueError, "ngrids must be positive"), + (111, 7, ValueError, "ngrids must be positive"), + ), +) def test_grid_errors(rect, ngrids, error, message): fig = plt.figure() with pytest.raises(error, match=message): Grid(fig, rect, (2, 3), ngrids=ngrids) -@pytest.mark.parametrize('anchor, error, message', ( - (None, TypeError, "anchor must be str"), - ("CC", ValueError, "'CC' is not a valid value for anchor"), - ((1, 1, 1), TypeError, "anchor must be str"), -)) +@pytest.mark.parametrize( + "anchor, error, message", + ( + (None, TypeError, "anchor must be str"), + ("CC", ValueError, "'CC' is not a valid value for anchor"), + ((1, 1, 1), TypeError, "anchor must be str"), + ), +) def test_divider_errors(anchor, error, message): fig = plt.figure() with pytest.raises(error, match=message): - Divider(fig, [0, 0, 1, 1], [Size.Fixed(1)], [Size.Fixed(1)], - anchor=anchor) + Divider( + fig, + [0, 0, 1, 1], + [Size.Fixed(1)], + [Size.Fixed(1)], + anchor=anchor, + ) @check_figures_equal(extensions=["png"]) @@ -627,8 +874,11 @@ def test_auto_adjustable(): # Update style when regenerating the test image -@image_comparison(['rgb_axes.png'], remove_text=True, - style=('classic', '_classic_test_patch')) +@image_comparison( + ["rgb_axes.png"], + remove_text=True, + style=("classic", "_classic_test_patch"), +) def test_rgb_axes(): fig = plt.figure() ax = RGBAxes(fig, (0.1, 0.1, 0.8, 0.8), pad=0.1) @@ -636,12 +886,15 @@ def test_rgb_axes(): r = rng.random((5, 5)) g = rng.random((5, 5)) b = rng.random((5, 5)) - ax.imshow_rgb(r, g, b, interpolation='none') + ax.imshow_rgb(r, g, b, interpolation="none") # Update style when regenerating the test image -@image_comparison(['insetposition.png'], remove_text=True, - style=('classic', '_classic_test_patch')) +@image_comparison( + ["insetposition.png"], + remove_text=True, + style=("classic", "_classic_test_patch"), +) def test_insetposition(): fig, ax = plt.subplots(figsize=(2, 2)) ax_ins = plt.axes([0, 0, 1, 1]) @@ -652,35 +905,50 @@ def test_insetposition(): # The original version of this test relied on mpl_toolkits's slightly different # colorbar implementation; moving to matplotlib's own colorbar implementation # caused the small image comparison error. -@image_comparison(['imagegrid_cbar_mode.png'], - remove_text=True, style='mpl20', tol=0.3) +@image_comparison( + ["imagegrid_cbar_mode.png"], + remove_text=True, + style="mpl20", + tol=0.3, +) def test_imagegrid_cbar_mode_edge(): # Remove this line when this test image is regenerated. - plt.rcParams['pcolormesh.snap'] = False + plt.rcParams["pcolormesh.snap"] = False X, Y = np.meshgrid(np.linspace(0, 6, 30), np.linspace(0, 6, 30)) - arr = np.sin(X) * np.cos(Y) + 1j*(np.sin(3*Y) * np.cos(Y/2.)) + arr = np.sin(X) * np.cos(Y) + 1j * ( + np.sin(3 * Y) * np.cos(Y / 2.0) + ) fig = plt.figure(figsize=(18, 9)) positions = (241, 242, 243, 244, 245, 246, 247, 248) - directions = ['row']*4 + ['column']*4 - cbar_locations = ['left', 'right', 'top', 'bottom']*2 + directions = ["row"] * 4 + ["column"] * 4 + cbar_locations = ["left", "right", "top", "bottom"] * 2 for position, direction, location in zip( - positions, directions, cbar_locations): - grid = ImageGrid(fig, position, - nrows_ncols=(2, 2), - direction=direction, - cbar_location=location, - cbar_size='20%', - cbar_mode='edge') - ax1, ax2, ax3, ax4, = grid - - ax1.imshow(arr.real, cmap='nipy_spectral') - ax2.imshow(arr.imag, cmap='hot') - ax3.imshow(np.abs(arr), cmap='jet') - ax4.imshow(np.arctan2(arr.imag, arr.real), cmap='hsv') + positions, directions, cbar_locations + ): + grid = ImageGrid( + fig, + position, + nrows_ncols=(2, 2), + direction=direction, + cbar_location=location, + cbar_size="20%", + cbar_mode="edge", + ) + ( + ax1, + ax2, + ax3, + ax4, + ) = grid + + ax1.imshow(arr.real, cmap="nipy_spectral") + ax2.imshow(arr.imag, cmap="hot") + ax3.imshow(np.abs(arr), cmap="jet") + ax4.imshow(np.arctan2(arr.imag, arr.real), cmap="hsv") # In each row/column, the "first" colorbars must be overwritten by the # "second" ones. To achieve this, clear out the axes first. @@ -699,11 +967,42 @@ def test_imagegrid(): def test_removal(): - import matplotlib.pyplot as plt import mpl_toolkits.axisartist as AA + + import matplotlib.pyplot as plt fig = plt.figure() ax = host_subplot(111, axes_class=AA.Axes, figure=fig) col = ax.fill_between(range(5), 0, range(5)) fig.canvas.draw() col.remove() fig.canvas.draw() +@image_comparison(['anchored_locator_base_call.png'], style="classic") +def test_anchored_locator_base_call(): + fig = plt.figure(figsize=(3, 3)) + fig1, fig2 = fig.subfigures( + nrows=2, ncols=1, height_ratios=[1, 1], squeeze=True + ) + + ax = fig1.subplots() + ax.set(aspect=1, xlim=(-15, 15), ylim=(-20, 5)) + + Z = cbook.get_sample_data( + "axes_grid/bivariate_normal.npy", np_load=True + ) + extent = (-3, 4, -4, 3) + + axins = zoomed_inset_axes(ax, zoom=2, loc="upper left") + axins.set(xticks=[], yticks=[]) + im = axins.imshow(Z, extent=extent, origin="lower") + + # colorbar + cax = inset_axes( + axins, + width="5%", # width = 10% of parent_bbox width + height="100%", # height : 50% + loc="lower left", + bbox_to_anchor=(1.05, 0.0, 1, 1), + bbox_transform=axins.transAxes, + borderpad=0, + ) + fig.colorbar(im, cax=cax) From 345718a65e27ffe0e599e4aebb3e8a014b20e063 Mon Sep 17 00:00:00 2001 From: matt statham Date: Wed, 14 Dec 2022 21:27:07 -0600 Subject: [PATCH 2/3] fixed formatting issues caused by black --- .../axes_grid1/tests/test_axes_grid1.py | 36 +++++++------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py b/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py index 712e54fb6edf..fc7a7896794a 100644 --- a/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py +++ b/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py @@ -34,24 +34,14 @@ AnchoredSizeBar, ) from mpl_toolkits.axes_grid1.axes_divider import ( - Divider, - HBoxDivider, - SubplotDivider, - VBoxDivider, - make_axes_area_auto_adjustable, -) + Divider, HBoxDivider, SubplotDivider, VBoxDivider, + make_axes_area_auto_adjustable) from mpl_toolkits.axes_grid1.axes_rgb import RGBAxes -from mpl_toolkits.axes_grid1.inset_locator import ( - BboxConnectorPatch, - InsetPosition, - inset_axes, - mark_inset, - zoomed_inset_axes, -) -from numpy.testing import ( - assert_array_almost_equal, - assert_array_equal, -) +from mpl_toolkits.axes_grid1.inset_locator import (BboxConnectorPatch, + InsetPosition, inset_axes, + mark_inset, + zoomed_inset_axes) +from numpy.testing import assert_array_almost_equal, assert_array_equal <<<<<<< HEAD import numpy as np @@ -64,11 +54,9 @@ from matplotlib import cbook from matplotlib.backend_bases import MouseEvent from matplotlib.colors import LogNorm -from matplotlib.testing.decorators import ( - check_figures_equal, - image_comparison, - remove_ticks_and_titles, -) +from matplotlib.testing.decorators import (check_figures_equal, + image_comparison, + remove_ticks_and_titles) from matplotlib.transforms import Bbox, TransformedBbox >>>>>>> 6d992cad91... fixed long line linter issues @@ -215,7 +203,7 @@ def test_inset_locator(): extent = (-3, 4, -4, 3) Z2 = np.zeros((150, 150)) ny, nx = Z.shape - Z2[30 : 30 + ny, 30 : 30 + nx] = Z + Z2[30:30 + ny, 30:30 + nx] = Z ax.imshow( Z2, extent=extent, interpolation="nearest", origin="lower" @@ -266,7 +254,7 @@ def test_inset_axes(): extent = (-3, 4, -4, 3) Z2 = np.zeros((150, 150)) ny, nx = Z.shape - Z2[30 : 30 + ny, 30 : 30 + nx] = Z + Z2[30:30 + ny, 30:30 + nx] = Z ax.imshow( Z2, extent=extent, interpolation="nearest", origin="lower" From 4d64dd7127f00fd0e49e5755369f82e9918c6bde Mon Sep 17 00:00:00 2001 From: matt statham Date: Wed, 14 Dec 2022 22:38:08 -0600 Subject: [PATCH 3/3] formatting --- .../axes_grid1/tests/test_axes_grid1.py | 34 ++----------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py b/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py index fc7a7896794a..2111b760fd04 100644 --- a/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py +++ b/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py @@ -29,36 +29,6 @@ image_comparison, remove_ticks_and_titles) from matplotlib.transforms import Bbox, TransformedBbox -from mpl_toolkits.axes_grid1.anchored_artists import ( - AnchoredDirectionArrows, - AnchoredSizeBar, -) -from mpl_toolkits.axes_grid1.axes_divider import ( - Divider, HBoxDivider, SubplotDivider, VBoxDivider, - make_axes_area_auto_adjustable) -from mpl_toolkits.axes_grid1.axes_rgb import RGBAxes -from mpl_toolkits.axes_grid1.inset_locator import (BboxConnectorPatch, - InsetPosition, inset_axes, - mark_inset, - zoomed_inset_axes) -from numpy.testing import assert_array_almost_equal, assert_array_equal - -<<<<<<< HEAD -import numpy as np -from numpy.testing import assert_array_equal, assert_array_almost_equal ->>>>>>> 955967cb46... formatting -======= -import matplotlib as mpl -import matplotlib.pyplot as plt -import matplotlib.ticker as mticker -from matplotlib import cbook -from matplotlib.backend_bases import MouseEvent -from matplotlib.colors import LogNorm -from matplotlib.testing.decorators import (check_figures_equal, - image_comparison, - remove_ticks_and_titles) -from matplotlib.transforms import Bbox, TransformedBbox ->>>>>>> 6d992cad91... fixed long line linter issues def test_divider_append_axes(): @@ -964,7 +934,9 @@ def test_removal(): fig.canvas.draw() col.remove() fig.canvas.draw() -@image_comparison(['anchored_locator_base_call.png'], style="classic") + + +@image_comparison(['anchored_locator_base_call.png'], style="mpl20") def test_anchored_locator_base_call(): fig = plt.figure(figsize=(3, 3)) fig1, fig2 = fig.subfigures( pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy