Commitec50ff3

authored

Merge pull request#26770 from meeseeksmachine/auto-backport-of-pr-26762-on-v3.8.x

2 parents4f15bdf +661c871 commitec50ff3Copy full SHA for ec50ff3

File tree

+10

-8

lines changed

+10

-8

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -734,7 +734,8 @@ def safe_masked_invalid(x, copy=False):`
`734`	`734`	`ifnotx.dtype.isnative:`
`735`	`735`	`# If we have already made a copy, do the byteswap in place, else make a`
`736`	`736`	`# copy with the byte order swapped.`
`737`		`-x=x.byteswap(inplace=copy).newbyteorder('N')# Swap to native order.`
	`737`	`+# Swap to native order.`
	`738`	`+x=x.byteswap(inplace=copy).view(x.dtype.newbyteorder('N'))`
`738`	`739`	`try:`
`739`	`740`	`xm=np.ma.masked_where(~(np.isfinite(x)),x,copy=False)`
`740`	`741`	`exceptTypeError:`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -726,7 +726,8 @@ def __call__(self, X, alpha=None, bytes=False):`
`726`	`726`
`727`	`727`	`xa=np.array(X,copy=True)`
`728`	`728`	`ifnotxa.dtype.isnative:`
`729`		`-xa=xa.byteswap().newbyteorder()# Native byteorder is faster.`
	`729`	`+# Native byteorder is faster.`
	`730`	`+xa=xa.byteswap().view(xa.dtype.newbyteorder())`
`730`	`731`	`ifxa.dtype.kind=="f":`
`731`	`732`	`xa*=self.N`
`732`	`733`	`# xa == 1 (== N after multiplication) is not out of range.`
`@@ -2161,7 +2162,7 @@ def rgb_to_hsv(arr):`
`2161`	`2162`	`out=np.zeros_like(arr)`
`2162`	`2163`	`arr_max=arr.max(-1)`
`2163`	`2164`	`ipos=arr_max>0`
`2164`		`-delta=arr.ptp(-1)`
	`2165`	`+delta=np.ptp(arr,-1)`
`2165`	`2166`	`s=np.zeros_like(delta)`
`2166`	`2167`	`s[ipos]=delta[ipos]/arr_max[ipos]`
`2167`	`2168`	`ipos=delta>0`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1327,7 +1327,7 @@ def test_pcolormesh():`
`1327`	`1327`	`Qz=np.sin(Y)+np.sin(X)`
`1328`	`1328`	`Qx= (Qx+1.1)`
`1329`	`1329`	`Z=np.hypot(X,Y)/5`
`1330`		`-Z= (Z-Z.min())/Z.ptp()`
	`1330`	`+Z= (Z-Z.min())/np.ptp(Z)`
`1331`	`1331`
`1332`	`1332`	`# The color array can include masked values:`
`1333`	`1333`	`Zm=ma.masked_where(np.abs(Qz)<0.5*np.max(Qz),Z)`
`@@ -1348,7 +1348,7 @@ def test_pcolormesh_small():`
`1348`	`1348`	`Qz=np.sin(Y)+np.sin(X)`
`1349`	`1349`	`Qx= (Qx+1.1)`
`1350`	`1350`	`Z=np.hypot(X,Y)/5`
`1351`		`-Z= (Z-Z.min())/Z.ptp()`
	`1351`	`+Z= (Z-Z.min())/np.ptp(Z)`
`1352`	`1352`	`Zm=ma.masked_where(np.abs(Qz)<0.5*np.max(Qz),Z)`
`1353`	`1353`	`Zm2=ma.masked_where(Qz<-0.5*np.max(Qz),Z)`
`1354`	`1354`
`@@ -1378,7 +1378,7 @@ def test_pcolormesh_alpha():`
`1378`	`1378`	`Qx=X`
`1379`	`1379`	`Qy=Y+np.sin(X)`
`1380`	`1380`	`Z=np.hypot(X,Y)/5`
`1381`		`-Z= (Z-Z.min())/Z.ptp()`
	`1381`	`+Z= (Z-Z.min())/np.ptp(Z)`
`1382`	`1382`	`vir=mpl.colormaps["viridis"].resampled(16)`
`1383`	`1383`	`# make another colormap with varying alpha`
`1384`	`1384`	`colors=vir(np.arange(16))`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ def test_colormap_endian():`
`216`	`216`	`a= [-0.5,0,0.5,1,1.5,np.nan]`
`217`	`217`	`fordtin ["f2","f4","f8"]:`
`218`	`218`	`anative=np.ma.masked_invalid(np.array(a,dtype=dt))`
`219`		`-aforeign=anative.byteswap().newbyteorder()`
	`219`	`+aforeign=anative.byteswap().view(anative.dtype.newbyteorder())`
`220`	`220`	`assert_array_equal(cmap(anative),cmap(aforeign))`
`221`	`221`
`222`	`222`
`@@ -1126,7 +1126,7 @@ def alternative_hillshade(azimuth, elev, z):`
`1126`	`1126`
`1127`	`1127`	`intensity=np.tensordot(normals,illum,axes=(2,0))`
`1128`	`1128`	`intensity-=intensity.min()`
`1129`		`-intensity/=intensity.ptp()`
	`1129`	`+intensity/=np.ptp(intensity)`
`1130`	`1130`	`returnintensity`
`1131`	`1131`
`1132`	`1132`	`y,x=np.mgrid[5:0:-1, :5]`

Comments

(0)