fix: raise errors for invalid shears

Author: beckermr

tests/galsim_test_helpers.py

@@ -16,6 +16,7 @@
 #    and/or other materials provided with the distribution.
 #
 
+import equinox
 import pytest
 import numpy as np
 import galsim
@@ -52,6 +53,7 @@
     "pytest",
     "run_slow",
     "runtests",
+    "equinox",
 ]
 
 # This file has some helper functions that are used by tests from multiple files to help

tests/test_shear.py

@@ -176,23 +176,17 @@ def test_shear_initialization():
     assert_raises(TypeError,galsim.Shear,g1=0.3,e2=0.2)
     assert_raises(TypeError,galsim.Shear,eta1=0.3,beta=0.*galsim.degrees)
     assert_raises(TypeError,galsim.Shear,q=0.3)
-    if is_jax_galsim():
-        pass
-    else:
-        assert_raises(galsim.GalSimRangeError,galsim.Shear,q=1.3,beta=0.*galsim.degrees)
-        assert_raises(galsim.GalSimRangeError,galsim.Shear,g1=0.9,g2=0.6)
-        assert_raises(galsim.GalSimRangeError,galsim.Shear,e=-1.3,beta=0.*galsim.radians)
-        assert_raises(galsim.GalSimRangeError,galsim.Shear,e=1.3,beta=0.*galsim.radians)
-        assert_raises(galsim.GalSimRangeError,galsim.Shear,e1=0.7,e2=0.9)
+    assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,q=1.3,beta=0.*galsim.degrees)
+    assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,g1=0.9,g2=0.6)
+    assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,e=-1.3,beta=0.*galsim.radians)
+    assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,e=1.3,beta=0.*galsim.radians)
+    assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,e1=0.7,e2=0.9)
     assert_raises(TypeError,galsim.Shear,g=0.5)
     assert_raises(TypeError,galsim.Shear,e=0.5)
     assert_raises(TypeError,galsim.Shear,eta=0.5)
-    if is_jax_galsim():
-        pass
-    else:
-        assert_raises(galsim.GalSimRangeError,galsim.Shear,eta=-0.5,beta=0.*galsim.radians)
-        assert_raises(galsim.GalSimRangeError,galsim.Shear,g=1.3,beta=0.*galsim.radians)
-        assert_raises(galsim.GalSimRangeError,galsim.Shear,g=-0.3,beta=0.*galsim.radians)
+    assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,eta=-0.5,beta=0.*galsim.radians)
+    assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,g=1.3,beta=0.*galsim.radians)
+    assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,g=-0.3,beta=0.*galsim.radians)
     assert_raises(TypeError,galsim.Shear,e=0.3,beta=0.)
     assert_raises(TypeError,galsim.Shear,eta=0.3,beta=0.)
     assert_raises(TypeError,galsim.Shear,randomkwarg=0.1)

tests/test_wcs.py

@@ -1186,10 +1186,7 @@ def test_pixelscale(run_slow):
     assert wcs.world_origin == galsim.PositionD(0,0)
 
     assert_raises(TypeError, galsim.PixelScale)
-    if is_jax_galsim():
-        pass
-    else:
-        assert_raises(TypeError, galsim.PixelScale, scale=galsim.PixelScale(scale))
+    assert_raises(TypeError, galsim.PixelScale, scale=galsim.PixelScale(scale))
     assert_raises(TypeError, galsim.PixelScale, scale=scale, origin=galsim.PositionD(0,0))
     assert_raises(TypeError, galsim.PixelScale, scale=scale, world_origin=galsim.PositionD(0,0))