Move f32 to wave_common to fix circular imports

corrscope/spectrum.py

@@ -4,7 +4,7 @@ import numpy as np
 
 import corrscope.utils.scipy.signal as signal
 from corrscope.config import KeywordAttrs
-from corrscope.wave import f32
+from corrscope.wave_common import f32
 
 
 class SpectrumConfig(KeywordAttrs):

corrscope/triggers.py

@@ -17,7 +17,7 @@ from corrscope.utils.trigger_util import (
     abs_max,
 )
 from corrscope.utils.windows import leftpad, midpad, rightpad, gaussian_or_zero
-from corrscope.wave import f32
+from corrscope.wave_common import f32
 
 if TYPE_CHECKING:
     from corrscope.wave import Wave

corrscope/utils/scipy/windows.py

@@ -37,7 +37,7 @@ from typing import List, Tuple
 
 import numpy as np
 
-from corrscope.wave import f32
+from corrscope.wave_common import f32
 
 __all__ = ['boxcar', 'triang', 'parzen', 'bohman', 'blackman', 'nuttall',
            'blackmanharris', 'flattop', 'bartlett', 'hanning', 'barthann',

corrscope/utils/trigger_util.py

@@ -4,7 +4,7 @@ import numpy as np
 
 import corrscope.utils.scipy.signal as signal
 from corrscope.util import iround
-from corrscope.wave import f32
+from corrscope.wave_common import f32
 
 if TYPE_CHECKING:
     import corrscope.triggers as t

corrscope/utils/windows.py

@@ -1,7 +1,7 @@
 import numpy as np
 
 from corrscope.utils.scipy import windows
-from corrscope.wave import f32
+from corrscope.wave_common import f32
 
 
 def leftpad(data: np.ndarray, n: int) -> np.ndarray:

corrscope/wave.py

@@ -6,11 +6,8 @@ import numpy as np
 
 import corrscope.utils.scipy.wavfile as wavfile
 from corrscope.config import CorrError, TypedEnumDump
-
-f32 = np.single
-
-# Depends on f32
 from corrscope.utils.windows import rightpad
+from corrscope.wave_common import f32
 
 
 @enum.unique

corrscope/wave_common.py

@@ -0,0 +1,3 @@
+import numpy as np
+
+f32 = np.single