From 11c473b4fde8b8b730af654a47b96e7894862d57 Mon Sep 17 00:00:00 2001 From: beckermr Date: Thu, 14 May 2026 05:55:37 -0500 Subject: [PATCH 1/3] fix: raise errors for invalid shears --- tests/galsim_test_helpers.py | 2 ++ tests/test_shear.py | 22 ++++++++-------------- tests/test_wcs.py | 5 +---- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/tests/galsim_test_helpers.py b/tests/galsim_test_helpers.py index d9804fd853..e4638026fd 100644 --- a/tests/galsim_test_helpers.py +++ b/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 diff --git a/tests/test_shear.py b/tests/test_shear.py index 3492b80c73..a171888352 100644 --- a/tests/test_shear.py +++ b/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) diff --git a/tests/test_wcs.py b/tests/test_wcs.py index a45fc68284..b83789f490 100644 --- a/tests/test_wcs.py +++ b/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)) From 062c9ed06ae309b1a47885ee8abee3b7860760ac Mon Sep 17 00:00:00 2001 From: beckermr Date: Thu, 14 May 2026 06:31:26 -0500 Subject: [PATCH 2/3] fix: mock up equinox --- tests/galsim_test_helpers.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/galsim_test_helpers.py b/tests/galsim_test_helpers.py index e4638026fd..94e3ad2d82 100644 --- a/tests/galsim_test_helpers.py +++ b/tests/galsim_test_helpers.py @@ -16,7 +16,12 @@ # and/or other materials provided with the distribution. # -import equinox +try: + import equinox +except ImportError: + class equinox(): + EquinoxRuntimeError = RuntimeError + import pytest import numpy as np import galsim From e5ee401606efcc43b6a8f6ca5a204f5d95befc94 Mon Sep 17 00:00:00 2001 From: beckermr Date: Thu, 14 May 2026 06:35:30 -0500 Subject: [PATCH 3/3] fix: more array equals --- tests/test_shear.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_shear.py b/tests/test_shear.py index a171888352..cb1cb23cf6 100644 --- a/tests/test_shear.py +++ b/tests/test_shear.py @@ -236,9 +236,9 @@ def test_shear_methods(): # check == s = galsim.Shear(g1 = g1[ind], g2 = g2[ind]) s2 = galsim.Shear(g1 = g1[ind], g2 = g2[ind]) - np.testing.assert_equal(s == s2, True, err_msg = "Failed to check for equality") + np.testing.assert_array_equal(s == s2, True, err_msg = "Failed to check for equality") # check != - np.testing.assert_equal(s != s2, False, err_msg = "Failed to check for equality") + np.testing.assert_array_equal(s != s2, False, err_msg = "Failed to check for equality") @timer