Commit69961d6

authored

Merge pull request#26653 from meeseeksmachine/auto-backport-of-pr-26597-on-v3.7.x

Backport PR#26597 on branch v3.7.x (Squeeze post-converted values when validating limits)

2 parents3c98167 +815ab8a commit69961d6Copy full SHA for 69961d6

File tree

+14

-0

lines changed

+14

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3565,6 +3565,8 @@ def _validate_converted_limits(self, limit, convert):`
`3565`	`3565`	`"""`
`3566`	`3566`	`iflimitisnotNone:`
`3567`	`3567`	`converted_limit=convert(limit)`
	`3568`	`+ifisinstance(converted_limit,np.ndarray):`
	`3569`	`+converted_limit=converted_limit.squeeze()`
`3568`	`3570`	`if (isinstance(converted_limit,Real)`
`3569`	`3571`	`andnotnp.isfinite(converted_limit)):`
`3570`	`3572`	`raiseValueError("Axis limits cannot be NaN or Inf")`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`"""Catch all for categorical functions"""`
	`2`	`+importwarnings`
	`3`	`+`
`2`	`4`	`importpytest`
`3`	`5`	`importnumpyasnp`
`4`	`6`
`@@ -309,3 +311,13 @@ def test_hist():`
`309`	`311`	`n,bins,patches=ax.hist(['a','b','a','c','ff'])`
`310`	`312`	`assertn.shape== (10,)`
`311`	`313`	`np.testing.assert_allclose(n, [2.,0.,0.,1.,0.,0.,1.,0.,0.,1.])`
	`314`	`+`
	`315`	`+`
	`316`	`+deftest_set_lim():`
	`317`	`+# Numpy 1.25 deprecated casting [2.] to float, catch_warnings added to error`
	`318`	`+# with numpy 1.25 and prior to the change from gh-26597`
	`319`	`+# can be removed once the minimum numpy version has expired the warning`
	`320`	`+f,ax=plt.subplots()`
	`321`	`+ax.plot(["a","b","c","d"], [1,2,3,4])`
	`322`	`+withwarnings.catch_warnings():`
	`323`	`+ax.set_xlim("b","c")`

Comments

(0)