Commit3fa730d

authored

Merge pull request#29616 from timhoffm/fix-units

FIX: Fix unit example so that we can unpin numpy<2.1

2 parents3f91524 +2c087c1 commit3fa730dCopy full SHA for 3fa730d

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ commands:`
`98`	`98`	`parameters:`
`99`	`99`	`numpy_version:`
`100`	`100`	`type:string`
`101`		`-default:"~=2.0.0"`
	`101`	`+default:""`
`102`	`102`	`steps:`
`103`	`103`	`-run:`
`104`	`104`	`name:Install Python dependencies`

Lines changed: 1 addition & 1 deletion

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,11 @@ def get_unit(self):`
`193`	`193`
`194`	`194`
`195`	`195`	`classBasicUnit:`
	`196`	`+# numpy scalars convert eager and np.float64(2) * BasicUnit('cm')`
	`197`	`+# would thus return a numpy scalar. To avoid this, we increase the`
	`198`	`+# priority of the BasicUnit.`
	`199`	`+__array_priority__=np.float64(0).__array_priority__+1`
	`200`	`+`
`196`	`201`	`def__init__(self,name,fullname=None):`
`197`	`202`	`self.name=name`
`198`	`203`	`iffullnameisNone:`

Comments

(0)