Merge branch 'fix/auto-upgrade'

microdrop_launcher/auto_upgrade.py

@@ -24,7 +24,21 @@ def _strip_conda_menuinst_messages(conda_output):
     [1]: https://groups.google.com/a/continuum.io/forum/#!topic/anaconda/RWs9of4I2KM
     '''
     return '\n'.join(line_i for line_i in conda_output.splitlines()
-                     if not line_i.startswith('INFO'))
+                     if not line_i.strip().startswith('INFO'))
+
+
+def _strip_progress_messages(conda_output):
+    '''
+    Strip progress messages from Conda install output log.
+
+    For example:
+
+        {"maxval": 133256, "finished": false, "fetch": "microdrop-laun", "progress": 0}
+    '''
+    cre_json_progress = re.compile(r'{"maxval":[^,]+,\s+"finished":[^,]+,'
+                                   r'\s+"fetch":\s+[^,]+,\s+"progress":[^}]+}')
+    return '\n'.join(line_i for line_i in conda_output.splitlines()
+                     if not cre_json_progress.search(line_i))
 
 
 def main():
@@ -38,6 +52,10 @@ def main():
         Fix displayed package name during upgrade.
 
         Fail gracefully with warning on JSON decode error.
+
+    .. versionchanged:: 0.7.7
+        Strip progress messages from Conda install output log to prevent JSON
+        decoding errors.
     '''
     # Upgrade `microdrop-launcher` package if there is a new version available.
     print 'Checking for `microdrop-launcher` updates',
@@ -67,7 +85,7 @@ def main():
             # A new version of the launcher is available for installation.
             print 'Upgrading to:', launcher_packages[0]
             install_log_json = ch.conda_exec('install', '--json',
-                                             'microdrop-launcher',
+                                             'microdrop-launcher', '--quiet',
                                              verbose=False)
             install_log_json = _strip_conda_menuinst_messages(install_log_json)
             try: