CellProfiler-nightly 5.0.0.dev77__tar.gz → 5.0.0.dev83__tar.gz

{cellprofiler_nightly-5.0.0.dev77 → cellprofiler_nightly-5.0.0.dev83}/CellProfiler_nightly.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CellProfiler-nightly
-Version: 5.0.0.dev77
+Version: 5.0.0.dev83
 Summary: CellProfiler is a free open-source software designed to enable biologists without training in computer vision or programming to quantitatively measure phenotypes from thousands of images automatically.
 Author: Anne Carpenter, Thouis (Ray) Jones, Lee Kamentsky, Vebjorn Ljosa, David Logan, Mark Bray, Madison Swain-Bowden, Allen Goodman, Claire McQuinn, Alice Lucas, Callum Tromans-Coia
 Author-email: Beth Cimini <bcimini@broadinstitute.org>, David Stirling <dstirling@glencoesoftware.com>, Nodar Gogoberidze <ngogober@broadinstitute.org>

{cellprofiler_nightly-5.0.0.dev77 → cellprofiler_nightly-5.0.0.dev83}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CellProfiler-nightly
-Version: 5.0.0.dev77
+Version: 5.0.0.dev83
 Summary: CellProfiler is a free open-source software designed to enable biologists without training in computer vision or programming to quantitatively measure phenotypes from thousands of images automatically.
 Author: Anne Carpenter, Thouis (Ray) Jones, Lee Kamentsky, Vebjorn Ljosa, David Logan, Mark Bray, Madison Swain-Bowden, Allen Goodman, Claire McQuinn, Alice Lucas, Callum Tromans-Coia
 Author-email: Beth Cimini <bcimini@broadinstitute.org>, David Stirling <dstirling@glencoesoftware.com>, Nodar Gogoberidze <ngogober@broadinstitute.org>

{cellprofiler_nightly-5.0.0.dev77 → cellprofiler_nightly-5.0.0.dev83}/cellprofiler/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '5.0.0.dev77'
-__version_tuple__ = version_tuple = (5, 0, 0, 'dev77')
+__version__ = version = '5.0.0.dev83'
+__version_tuple__ = version_tuple = (5, 0, 0, 'dev83')

{cellprofiler_nightly-5.0.0.dev77 → cellprofiler_nightly-5.0.0.dev83}/cellprofiler/modules/classifyobjects.py

@@ -1080,7 +1080,7 @@ Select a name for the object set generated by your classifier.
 
         if self.show_window:
             workspace.display_data.in_high_class = in_high_class
-            workspace.display_data.labels = (objects.segmented,)
+            workspace.display_data.labels = objects.segmented
             workspace.display_data.saved_values = saved_values
 
     def display_two_measurements(self, workspace, figure):
@@ -1482,6 +1482,10 @@ Select a name for the object set generated by your classifier.
                                 [f"{rule.object_name}_{rule.feature}" for rule in rules.rules])
         return d[path_]
 
+    def get_dictionary_for_worker(self):
+        # Sklearn models can't be serialized, so workers will need to read them from disk.
+        return {}
+   
     def get_classifier(self):
         return self.load_classifier()[0]
 

{cellprofiler_nightly-5.0.0.dev77 → cellprofiler_nightly-5.0.0.dev83}/cellprofiler/modules/measureimagequality.py

@@ -1038,7 +1038,7 @@ to the foreground pixels or the background pixels.
                         if image_names in self.images_to_process(
                             image_group, None, pipeline
                         ):
-                            result += [scale_group.scale]
+                            result += [scale_group.scale.value]
                 return result
             if measurement.startswith(F_THRESHOLD):
                 result = []

{cellprofiler_nightly-5.0.0.dev77 → cellprofiler_nightly-5.0.0.dev83}/cellprofiler/modules/measureimageskeleton.py

@@ -199,8 +199,8 @@ You can create a morphological skeleton with the
 
         if object_name == "Image" and category == "Skeleton":
             return [
-                "Skeleton_Branches_{}".format(name),
-                "Skeleton_Endpoints_{}".format(name),
+                "Branches",
+                "Endpoints"
             ]
 
         return []