cellprofiler-core-nightly 5.0.0.dev265__py3-none-any.whl → 5.0.0.dev281__py3-none-any.whl

cellprofiler_core/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '5.0.0.dev265'
-__version_tuple__ = version_tuple = (5, 0, 0, 'dev265')
+__version__ = version = '5.0.0.dev281'
+__version_tuple__ = version_tuple = (5, 0, 0, 'dev281')
 
 __commit_id__ = commit_id = None

cellprofiler_core/setting/_setting.py

@@ -1,6 +1,6 @@
 import abc
 import uuid
-
+from enum import Enum
 from ._validation_error import ValidationError
 
 
@@ -108,6 +108,8 @@ class Setting(abc.ABC):
         # their .values are the same.
         if isinstance(x, Setting):
             return self.__key == x.__key
+        if isinstance(x, Enum):
+            return self.__value == x.value
         return self.eq(x)
 
     def eq(self, x):
@@ -169,4 +171,6 @@ class Setting(abc.ABC):
         return self.get_unicode_value()
 
     def get_unicode_value(self):
+        if isinstance(self.__value, Enum):
+            return self.__value.value
         return str(self.value_text)

{cellprofiler_core_nightly-5.0.0.dev265.dist-info → cellprofiler_core_nightly-5.0.0.dev281.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cellprofiler-core-nightly
-Version: 5.0.0.dev265
+Version: 5.0.0.dev281
 Summary: cellprofiler-core implements the bulk of CellProfiler's non-gui functionality
 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_core_nightly-5.0.0.dev265.dist-info → cellprofiler_core_nightly-5.0.0.dev281.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cellprofiler_core/__init__.py,sha256=_3kgQS8726Qn6s5G3k9qO5lP70iGHpCjCfN8WOZUmOY,51
 cellprofiler_core/__main__.py,sha256=TA41EatBuwAZ4DhfTnq8sJJzxdov9fBN_j7g9hvMJeo,1221
-cellprofiler_core/_version.py,sha256=oQvpVDsWUhaqcCL7cL75iNqq-cvJv-uME315MOU-q2E,721
+cellprofiler_core/_version.py,sha256=9KbQdnITYC4miZlBvzwgKS3ZsWylam2ViLqrFa8SIu8,721
 cellprofiler_core/analysis/__init__.py,sha256=3q_bxjv7sGtXWFGULDj1AB3Ntx7A3HPctk_sr6gL6Wo,694
 cellprofiler_core/analysis/_analysis.py,sha256=sKKK91ov5T1OuYaejvX8rM_Uk-2ggbkAPRji3cuL3SM,4259
 cellprofiler_core/analysis/_runner.py,sha256=UAV_In9l6RXzud0qWG-uDPPi8-WTydhDEgqMGeOWT5w,31610
@@ -176,7 +176,7 @@ cellprofiler_core/setting/_joiner.py,sha256=qagEfXYn2Qfj92ImzyfztkWgLXWAmIBmICzU
 cellprofiler_core/setting/_measurement.py,sha256=Ms2H9Q9ptRl_tjQowHnVFXRVM8-CLPJzjTPQtfqahZU,13419
 cellprofiler_core/setting/_path_list_display.py,sha256=nh_TWwOjYJiq9zzvAwp4gndXePgAmDOnxxoFS9RfR2s,471
 cellprofiler_core/setting/_regexp_text.py,sha256=1NAWQQ745zu9OkJWwllU4-5BAo4Yqc1rho1HtWUXjDM,1334
-cellprofiler_core/setting/_setting.py,sha256=gjtRx9hXTcsYZNHYTXaYV43OvL6Ho7_LCz0jw3OmWLs,5577
+cellprofiler_core/setting/_setting.py,sha256=xlGjXn0lrtoCHnovber_SyY2zuL95oGn4wJALz0rrgE,5754
 cellprofiler_core/setting/_settings_group.py,sha256=MWCp2A1N7Lzxo6bIpFCd0mJMjaEZYGCK3w8HpSq3XHo,1127
 cellprofiler_core/setting/_structuring_element.py,sha256=tv0fHRDvkY55A54ZISA9FpoXAOFAbSCQ7RGrfqA8oBQ,2502
 cellprofiler_core/setting/_table.py,sha256=i4y0hoTSIkxw-9hrZb_EGAN68EK6Dg3KSe7qmPaD1iQ,5709
@@ -305,8 +305,8 @@ cellprofiler_core/worker/_worker.py,sha256=-DGKaU8J91OrQvjoPdLqHPhmtXznIoxK2oxQP
 cellprofiler_core/workspace/__init__.py,sha256=_J7VJAGoTcSYMt5YB_Ol_JZJXkSj1shvUZpIqN4B6ew,98
 cellprofiler_core/workspace/_disposition_changed_event.py,sha256=7l2ewpHRhv0ErQvwGi7ifb9MZOX2iwvS-ttRmZpZP9Q,107
 cellprofiler_core/workspace/_workspace.py,sha256=GdnVgpnk3UL71qoKm8xvjuss6QvZ2t_K0xE8X0EqHLc,21602
-cellprofiler_core_nightly-5.0.0.dev265.dist-info/licenses/LICENSE,sha256=QLWaBS7kAioYx7PmJNXAMJaY8NODcFAag60YlUWuyz0,2276
-cellprofiler_core_nightly-5.0.0.dev265.dist-info/METADATA,sha256=wkPoivKo5ZgnSl35xaTp6Dtu8PxeCb03bLDrb3-jqms,5892
-cellprofiler_core_nightly-5.0.0.dev265.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cellprofiler_core_nightly-5.0.0.dev265.dist-info/top_level.txt,sha256=Cyr_eRUfEUpSmpsWAZAZGBqgRcpgnNrvD5DmkMDmCQk,18
-cellprofiler_core_nightly-5.0.0.dev265.dist-info/RECORD,,
+cellprofiler_core_nightly-5.0.0.dev281.dist-info/licenses/LICENSE,sha256=QLWaBS7kAioYx7PmJNXAMJaY8NODcFAag60YlUWuyz0,2276
+cellprofiler_core_nightly-5.0.0.dev281.dist-info/METADATA,sha256=N1QquJkSQRMI0VSguHfaKJXRZAsBmzu5wPVdy21BZto,5892
+cellprofiler_core_nightly-5.0.0.dev281.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cellprofiler_core_nightly-5.0.0.dev281.dist-info/top_level.txt,sha256=Cyr_eRUfEUpSmpsWAZAZGBqgRcpgnNrvD5DmkMDmCQk,18
+cellprofiler_core_nightly-5.0.0.dev281.dist-info/RECORD,,