add to init & avoid circular imports

neurodsp/plts/__init__.py

@@ -7,3 +7,4 @@
 from .spectral import (plot_power_spectra, plot_spectral_hist,
                        plot_scv, plot_scv_rs_lines, plot_scv_rs_matrix)
 from .timefrequency import plot_timefrequency
+from .combined import plot_timeseries_and_spectrum

neurodsp/plts/combined.py

@@ -2,9 +2,7 @@
 
 import matplotlib.pyplot as plt
 
-from neurodsp.spectral import compute_spectrum
 from neurodsp.utils.data import create_times
-from neurodsp.spectral.utils import trim_spectrum
 from neurodsp.plts.spectral import plot_power_spectra
 from neurodsp.plts.time_series import plot_time_series
 from neurodsp.plts.utils import savefig
@@ -43,6 +41,10 @@ def plot_timeseries_and_spectrum(sig, fs, ts_range=None, f_range=None, spectrum_
         These arguments are passed to both plot axes.
     """
 
+    # Import spectal functions locally to avoid circular imports
+    from neurodsp.spectral import compute_spectrum
+    from neurodsp.spectral.utils import trim_spectrum
+
     # Allow for defining color as 'color' (since one line per plot), rather than 'colors'
     if 'color' in plt_kwargs:
         plt_kwargs['colors'] = plt_kwargs.pop('color')