Merge branch 'develop'

sciris/sc_math.py

@@ -346,7 +346,7 @@ def smooth(data, repeats=None):
     kernel = np.array([0.25,0.5,0.25])
     for r in range(repeats):
         if output.ndim == 1:
-            np.convolve(data, kernel, mode='same')
+            output = np.convolve(output, kernel, mode='same')
         elif output.ndim == 2:
             for i in range(output.shape[0]): output[i,:] = np.convolve(output[i,:], kernel, mode='same')
             for j in range(output.shape[1]): output[:,j] = np.convolve(output[:,j], kernel, mode='same')

sciris/sc_utils.py

@@ -1002,8 +1002,11 @@ def fixedpause(delay=None, verbose=True):
         try:    start = _delaytime
         except: start = time.time()
         elapsed = time.time() - start
-        if elapsed<delay:
-            pl.pause(delay-elapsed)
+        remaining = delay-elapsed
+        if remaining>0:
+            if verbose:
+                print('Pausing for %0.1f s' % remaining)
+            time.sleep(remaining)
         else:
             if verbose:
                 print('Warning, delay less than elapsed time (%0.1f vs. %0.1f)' % (delay, elapsed))

sciris/sc_version.py

@@ -1,5 +1,5 @@
 __all__ = ['__version__', '__versiondate__', '__license__']
 
-__version__      = '0.13.7'
-__versiondate__  = '2019-05-01'
+__version__      = '0.13.8'
+__versiondate__  = '2019-05-09'
 __license__      = 'Sciris %s (%s) -- (c) Sciris.org' % (__version__, __versiondate__)