Skip to content

Commit 95ff6fd

Browse files
committed
fix: only use generic Exception
1 parent 8a86029 commit 95ff6fd

2 files changed

Lines changed: 8 additions & 15 deletions

File tree

tests/galsim_test_helpers.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
# and/or other materials provided with the distribution.
1717
#
1818

19-
try:
20-
import equinox
21-
except ImportError:
22-
class equinox():
23-
EquinoxRuntimeError = RuntimeError
24-
2519
import pytest
2620
import numpy as np
2721
import galsim
@@ -58,7 +52,6 @@ class equinox():
5852
"pytest",
5953
"run_slow",
6054
"runtests",
61-
"equinox",
6255
]
6356

6457
# This file has some helper functions that are used by tests from multiple files to help

tests/test_shear.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,17 +176,17 @@ def test_shear_initialization():
176176
assert_raises(TypeError,galsim.Shear,g1=0.3,e2=0.2)
177177
assert_raises(TypeError,galsim.Shear,eta1=0.3,beta=0.*galsim.degrees)
178178
assert_raises(TypeError,galsim.Shear,q=0.3)
179-
assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,q=1.3,beta=0.*galsim.degrees)
180-
assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,g1=0.9,g2=0.6)
181-
assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,e=-1.3,beta=0.*galsim.radians)
182-
assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,e=1.3,beta=0.*galsim.radians)
183-
assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,e1=0.7,e2=0.9)
179+
assert_raises((galsim.GalSimRangeError, Exception),galsim.Shear,q=1.3,beta=0.*galsim.degrees)
180+
assert_raises((galsim.GalSimRangeError, Exception),galsim.Shear,g1=0.9,g2=0.6)
181+
assert_raises((galsim.GalSimRangeError, Exception),galsim.Shear,e=-1.3,beta=0.*galsim.radians)
182+
assert_raises((galsim.GalSimRangeError, Exception),galsim.Shear,e=1.3,beta=0.*galsim.radians)
183+
assert_raises((galsim.GalSimRangeError, Exception),galsim.Shear,e1=0.7,e2=0.9)
184184
assert_raises(TypeError,galsim.Shear,g=0.5)
185185
assert_raises(TypeError,galsim.Shear,e=0.5)
186186
assert_raises(TypeError,galsim.Shear,eta=0.5)
187-
assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,eta=-0.5,beta=0.*galsim.radians)
188-
assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,g=1.3,beta=0.*galsim.radians)
189-
assert_raises((galsim.GalSimRangeError, equinox.EquinoxRuntimeError),galsim.Shear,g=-0.3,beta=0.*galsim.radians)
187+
assert_raises((galsim.GalSimRangeError, Exception),galsim.Shear,eta=-0.5,beta=0.*galsim.radians)
188+
assert_raises((galsim.GalSimRangeError, Exception),galsim.Shear,g=1.3,beta=0.*galsim.radians)
189+
assert_raises((galsim.GalSimRangeError, Exception),galsim.Shear,g=-0.3,beta=0.*galsim.radians)
190190
assert_raises(TypeError,galsim.Shear,e=0.3,beta=0.)
191191
assert_raises(TypeError,galsim.Shear,eta=0.3,beta=0.)
192192
assert_raises(TypeError,galsim.Shear,randomkwarg=0.1)

0 commit comments

Comments
 (0)