Merge pull request #5 from emilroz/mac_os_prereqs

Mac os prereqs
glencoesoftware · Jan 11, 2021 · d8d6b14 · d8d6b14
2 parents bb7218e + 277428f
commit d8d6b14
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1,2 @@
 include LICENSE
+graft cellprofiler/data
diff --git a/cellprofiler/analysis.py b/cellprofiler/analysis.py
@@ -737,7 +737,7 @@ def wait(self):
             if hasattr(sys, 'frozen'):
                 if sys.platform == 'darwin':
                     executable = os.path.join(
-                            os.path.dirname(sys.executable), "CellProfiler")
+                            os.path.dirname(sys.executable), "cp")
                     args = ([executable] + aw_args)
                 elif sys.platform.startswith('linux'):
                     aw_path = os.path.join(os.path.dirname(__file__),

diff --git a/cellprofiler/gui/pipelinecontroller.py b/cellprofiler/gui/pipelinecontroller.py
@@ -2327,6 +2327,7 @@ def do_analyze_images(self):
             num_workers = min(
                 len(self.__workspace.measurements.get_image_numbers()),
                 cellprofiler.preferences.get_max_workers())
+            logger.info("Using {} workers".format(num_workers))
             self.__analysis = cellprofiler.analysis.Analysis(
                 self.__pipeline,
                 measurements_file_path,
@@ -2339,7 +2340,7 @@ def do_analyze_images(self):
 
         except Exception as instance:
             extended_message = "Failure in analysis startup"
-
+            logger.error("Failed to run analysis", exc_info=True)
             error = cellprofiler.gui.dialog.Error("Error", extended_message)
 
             if error.status is wx.ID_CANCEL: