Merge branch 'develop'

sciris/sc_plotting.py

@@ -676,8 +676,9 @@ def bandedcolormap(minvalue=None, minsaturation=None, hueshift=None, saturations
 # Register colormaps
 pl.cm.register_cmap('alpine', alpinecolormap())
 pl.cm.register_cmap('parula', parulacolormap())
+pl.cm.register_cmap('turbo',  turbocolormap())
 pl.cm.register_cmap('banded', bandedcolormap())
-pl.cm.register_cmap('bi', bicolormap())
+pl.cm.register_cmap('bi',     bicolormap())
 
 
 ##############################################################################

sciris/sc_version.py

@@ -1,5 +1,5 @@
 __all__ = ['__version__', '__versiondate__', '__license__']
 
-__version__      = '0.16.5'
-__versiondate__  = '2020-03-27'
+__version__      = '0.16.6'
+__versiondate__  = '2020-03-29'
 __license__      = 'Sciris %s (%s) -- (c) Sciris.org' % (__version__, __versiondate__)

setup.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 '''
-Sciris is a flexible open source framework for building scientific web 
+Sciris is a flexible open source framework for building scientific web
 applications using Python and JavaScript. This library provides the underlying
 functions and data structures that support the webapp features, as well as
 being generally useful for scientific computing.
@@ -28,7 +28,7 @@
         'xlsxwriter',         # Spreadsheet output
         'requests',           # HTTP methods
         'python-Levenshtein', # For fuzzy string matching
-        'line_profiler ; platform_system != "Windows"', # For the line profiler -- do not install on Windows
+        'line_profiler ; platform_system == "Linux"',   # For the line profiler -- only install on Linux
         'colorama ;      platform_system == "Windows"', # For colored text output -- only install on Windows
         ]