opentrons 8.5.0a1__tar.gz → 8.5.0a2__tar.gz

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentrons
-Version: 8.5.0a1
+Version: 8.5.0a2
 Summary: The Opentrons API is a simple framework designed to make writing automated biology lab protocols easy.
 Author: Opentrons
 Author-email: engineering@opentrons.com
@@ -21,7 +21,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 License-File: ../LICENSE
-Requires-Dist: opentrons-shared-data==8.5.0a1
+Requires-Dist: opentrons-shared-data==8.5.0a2
 Requires-Dist: aionotify==0.3.1
 Requires-Dist: anyio<4.0.0,>=3.6.1
 Requires-Dist: jsonschema<4.18.0,>=3.0.1
@@ -35,9 +35,9 @@ Requires-Dist: pyusb==1.2.1
 Requires-Dist: importlib-metadata>=1.0; python_version < "3.8"
 Requires-Dist: packaging>=21.0
 Provides-Extra: ot2-hardware
-Requires-Dist: opentrons-hardware==8.5.0a1; extra == "ot2-hardware"
+Requires-Dist: opentrons-hardware==8.5.0a2; extra == "ot2-hardware"
 Provides-Extra: flex-hardware
-Requires-Dist: opentrons-hardware[FLEX]==8.5.0a1; extra == "flex-hardware"
+Requires-Dist: opentrons-hardware[FLEX]==8.5.0a2; extra == "flex-hardware"
 
 .. _Full API Documentation: http://docs.opentrons.com
 

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/src/opentrons/hardware_control/backends/flex_protocol.py

@@ -42,6 +42,7 @@ from opentrons.hardware_control.module_control import AttachedModulesControl
 from ..dev_types import OT3AttachedInstruments
 from .types import HWStopCondition
 
+
 Cls = TypeVar("Cls")
 
 
@@ -466,3 +467,27 @@ class FlexBackend(Protocol):
     async def increase_evo_disp_count(self, mount: OT3Mount) -> None:
         """Tell a pipette to increase it's evo-tip-dispense-count in eeprom."""
         ...
+
+    async def read_env_temp_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        ...
+
+    async def read_env_hum_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        ...
+
+    async def read_pressure_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        ...
+
+    async def read_capacitive_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        ...

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/src/opentrons/hardware_control/backends/ot3controller.py

@@ -215,7 +215,13 @@ from ..types import HepaFanState, HepaUVState, StatusBarState
 from .types import HWStopCondition
 from .flex_protocol import FlexBackend
 from .status_bar_state import StatusBarStateController
-from opentrons_hardware.sensors.types import SensorDataType
+from opentrons_hardware.sensors.sensor_types import (
+    EnvironmentSensor,
+    CapacitiveSensor,
+    PressureSensor,
+)
+from opentrons_hardware.sensors.types import SensorDataType, EnvironmentSensorDataType
+from opentrons_hardware.sensors.sensor_driver import SensorDriver
 from opentrons_hardware.sensors.utils import send_evo_dispense_count_increase
 
 log = logging.getLogger(__name__)
@@ -1835,3 +1841,72 @@ class OT3Controller(FlexBackend):
         await send_evo_dispense_count_increase(
             self._messenger, sensor_node_for_pipette(OT3Mount(mount.value))
         )
+
+    async def _read_env_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[EnvironmentSensorDataType]:
+        """Read and return the current sensor information."""
+        sensor = EnvironmentSensor.build(
+            sensor_id=SensorId.S0 if primary else SensorId.S1,
+            node_id=sensor_node_for_mount(mount),
+        )
+        s_driver = SensorDriver()
+        sensor_data = await s_driver.read(
+            can_messenger=self._messenger,
+            sensor=sensor,
+            offset=False,
+        )
+        assert sensor_data is None or isinstance(sensor_data, EnvironmentSensorDataType)
+        return sensor_data
+
+    async def read_env_temp_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        s_data = await self._read_env_sensor(mount, primary)
+        if s_data is None or s_data.temperature is None:
+            return None
+        return s_data.temperature.to_float()
+
+    async def read_env_hum_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        s_data = await self._read_env_sensor(mount, primary)
+        if s_data is None or s_data.humidity is None:
+            return None
+        return s_data.humidity.to_float()
+
+    async def read_pressure_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        sensor = PressureSensor.build(
+            sensor_id=SensorId.S0 if primary else SensorId.S1,
+            node_id=sensor_node_for_mount(mount),
+        )
+        s_driver = SensorDriver()
+        sensor_data = await s_driver.read(
+            can_messenger=self._messenger,
+            sensor=sensor,
+            offset=False,
+        )
+        assert sensor_data is None or isinstance(sensor_data, SensorDataType)
+        return sensor_data.to_float() if sensor_data else None
+
+    async def read_capacitive_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        sensor = CapacitiveSensor.build(
+            sensor_id=SensorId.S0 if primary else SensorId.S1,
+            node_id=sensor_node_for_mount(mount),
+        )
+        s_driver = SensorDriver()
+        sensor_data = await s_driver.read(
+            can_messenger=self._messenger,
+            sensor=sensor,
+            offset=False,
+        )
+        assert sensor_data is None or isinstance(sensor_data, SensorDataType)
+        return sensor_data.to_float() if sensor_data else None

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/src/opentrons/hardware_control/backends/ot3simulator.py

@@ -67,6 +67,7 @@ from .flex_protocol import (
     FlexBackend,
 )
 
+
 log = logging.getLogger(__name__)
 
 AXIS_TO_SUBSYSTEM = {
@@ -874,3 +875,29 @@ class OT3Simulator(FlexBackend):
 
     async def increase_evo_disp_count(self, mount: OT3Mount) -> None:
         pass
+
+    async def read_env_temp_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+
+        return 0.0
+
+    async def read_env_hum_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+
+        return 0.0
+
+    async def read_pressure_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        return 0.0
+
+    async def read_capacitive_sensor(
+        self, mount: OT3Mount, primary: bool
+    ) -> Optional[float]:
+        """Read and return the current sensor information."""
+        return 0.0

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/src/opentrons/hardware_control/instruments/ot3/pipette_handler.py

@@ -665,6 +665,7 @@ class OT3PipetteHandler:
             return None
 
         if is_full_dispense:
+            disp_vol = instrument.current_volume
             if push_out is None:
                 push_out_ul = instrument.push_out_volume
             else:

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/src/opentrons/hardware_control/ot3api.py

@@ -3140,3 +3140,35 @@ class OT3API(
         """Tell a pipette to increase its evo-tip-dispense-count in eeprom."""
         realmount = OT3Mount.from_mount(mount)
         await self._backend.increase_evo_disp_count(realmount)
+
+    async def read_stem_temperature(
+        self, mount: Union[top_types.Mount, OT3Mount], primary: bool = True
+    ) -> float:
+        """Read and return the current stem temperature."""
+        realmount = OT3Mount.from_mount(mount)
+        s_data = await self._backend.read_env_temp_sensor(realmount, primary)
+        return s_data if s_data else 0.0
+
+    async def read_stem_humidity(
+        self, mount: Union[top_types.Mount, OT3Mount], primary: bool = True
+    ) -> float:
+        """Read and return the current primary stem humidity."""
+        realmount = OT3Mount.from_mount(mount)
+        s_data = await self._backend.read_env_hum_sensor(realmount, primary)
+        return s_data if s_data else 0.0
+
+    async def read_stem_pressure(
+        self, mount: Union[top_types.Mount, OT3Mount], primary: bool = True
+    ) -> float:
+        """Read and return the current primary stem pressure."""
+        realmount = OT3Mount.from_mount(mount)
+        s_data = await self._backend.read_pressure_sensor(realmount, primary)
+        return s_data if s_data else 0.0
+
+    async def read_stem_capacitance(
+        self, mount: Union[top_types.Mount, OT3Mount], primary: bool = True
+    ) -> float:
+        """Read and return the current primary stem capacitance."""
+        realmount = OT3Mount.from_mount(mount)
+        s_data = await self._backend.read_capacitive_sensor(realmount, primary)
+        return s_data if s_data else 0.0

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/src/opentrons/protocol_api/_transfer_liquid_validation.py

@@ -33,7 +33,7 @@ def verify_and_normalize_transfer_args(
     last_tip_picked_up_from: Optional[Well],
     tip_racks: List[Labware],
     nozzle_map: NozzleMapInterface,
-    target_all_wells: bool,
+    group_wells_for_multi_channel: bool,
     current_volume: float,
     trash_location: Union[Location, Well, Labware, TrashBin, WasteChute],
 ) -> TransferInfo:
@@ -43,7 +43,7 @@ def verify_and_normalize_transfer_args(
     else:
         # If trash bin or waste chute, set this to empty to have less isinstance checks after this
         flat_dests_list = []
-    if not target_all_wells and nozzle_map.tip_count > 1:
+    if group_wells_for_multi_channel and nozzle_map.tip_count > 1:
         flat_sources_list = tx_liquid_utils.group_wells_for_multi_channel_transfer(
             flat_sources_list, nozzle_map
         )

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/src/opentrons/protocol_api/core/engine/protocol.py

@@ -1094,8 +1094,8 @@ class ProtocolCore(
             display_color=(liquid.displayColor.root if liquid.displayColor else None),
         )
 
-    def define_liquid_class(self, name: str, version: int) -> LiquidClass:
-        """Define a liquid class for use in transfer functions."""
+    def get_liquid_class(self, name: str, version: int) -> LiquidClass:
+        """Get an instance of a built-in liquid class."""
         try:
             # Check if we have already loaded this liquid class' definition
             liquid_class_def = self._liquid_class_def_cache[(name, version)]

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/src/opentrons/protocol_api/core/legacy/legacy_protocol_core.py

@@ -599,8 +599,8 @@ class LegacyProtocolCore(
         """Define a liquid to load into a well."""
         assert False, "define_liquid only supported on engine core"
 
-    def define_liquid_class(self, name: str, version: int) -> LiquidClass:
-        """Define a liquid class."""
+    def get_liquid_class(self, name: str, version: int) -> LiquidClass:
+        """Get an instance of a built-in liquid class."""
         assert False, "define_liquid_class is only supported on engine core"
 
     def get_labware_location(

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/src/opentrons/protocol_api/core/protocol.py

@@ -311,8 +311,8 @@ class AbstractProtocol(
         """Define a liquid to load into a well."""
 
     @abstractmethod
-    def define_liquid_class(self, name: str, version: int) -> LiquidClass:
-        """Define a liquid class for use in transfer functions."""
+    def get_liquid_class(self, name: str, version: int) -> LiquidClass:
+        """Get an instance of a built-in liquid class."""
 
     @abstractmethod
     def get_labware_location(

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/src/opentrons/protocol_api/instrument_context.py

@@ -1794,7 +1794,7 @@ class InstrumentContext(publisher.CommandPublisher):
             Union[types.Location, labware.Well, TrashBin, WasteChute]
         ] = None,
         return_tip: bool = False,
-        visit_every_well: bool = False,
+        group_wells: bool = True,
     ) -> InstrumentContext:
         """Move a particular type of liquid from one well or group of wells to another.
 
@@ -1827,6 +1827,9 @@ class InstrumentContext(publisher.CommandPublisher):
             tips. Depending on the liquid class, the pipette may also blow out liquid here.
         :param return_tip: Whether to drop used tips in their original locations
             in the tip rack, instead of the trash.
+        :param group_wells: For multi-channel transfers only. If set to ``True``, group together contiguous wells
+            given into a single transfer step, taking into account the tip configuration. If ``False``, target
+            each well given with the primary nozzle. Defaults to ``True``.
 
         :meta private:
         """
@@ -1844,7 +1847,7 @@ class InstrumentContext(publisher.CommandPublisher):
             last_tip_picked_up_from=self._last_tip_picked_up_from,
             tip_racks=self._tip_racks,
             nozzle_map=self._core.get_nozzle_map(),
-            target_all_wells=visit_every_well,
+            group_wells_for_multi_channel=group_wells,
             current_volume=self.current_volume,
             trash_location=(
                 trash_location if trash_location is not None else self.trash_container
@@ -1913,7 +1916,7 @@ class InstrumentContext(publisher.CommandPublisher):
             Union[types.Location, labware.Well, TrashBin, WasteChute]
         ] = None,
         return_tip: bool = False,
-        visit_every_well: bool = False,
+        group_wells: bool = True,
     ) -> InstrumentContext:
         """
         Distribute a particular type of liquid from one well to a group of wells.
@@ -1943,6 +1946,9 @@ class InstrumentContext(publisher.CommandPublisher):
             tips. Depending on the liquid class, the pipette may also blow out liquid here.
         :param return_tip: Whether to drop used tips in their original locations
             in the tip rack, instead of the trash.
+        :param group_wells: For multi-channel transfers only. If set to ``True``, group together contiguous wells
+            given into a single transfer step, taking into account the tip configuration. If ``False``, target
+            each well given with the primary nozzle. Defaults to ``True``.
 
         :meta private:
         """
@@ -1960,7 +1966,7 @@ class InstrumentContext(publisher.CommandPublisher):
             last_tip_picked_up_from=self._last_tip_picked_up_from,
             tip_racks=self._tip_racks,
             nozzle_map=self._core.get_nozzle_map(),
-            target_all_wells=visit_every_well,
+            group_wells_for_multi_channel=group_wells,
             current_volume=self.current_volume,
             trash_location=(
                 trash_location if trash_location is not None else self.trash_container
@@ -2035,7 +2041,7 @@ class InstrumentContext(publisher.CommandPublisher):
             Union[types.Location, labware.Well, TrashBin, WasteChute]
         ] = None,
         return_tip: bool = False,
-        visit_every_well: bool = False,
+        group_wells: bool = True,
     ) -> InstrumentContext:
         """
         Consolidate a particular type of liquid from a group of wells to one well.
@@ -2066,6 +2072,9 @@ class InstrumentContext(publisher.CommandPublisher):
             tips. Depending on the liquid class, the pipette may also blow out liquid here.
         :param return_tip: Whether to drop used tips in their original locations
             in the tip rack, instead of the trash.
+        :param group_wells: For multi-channel transfers only. If set to ``True``, group together contiguous wells
+            given into a single transfer step, taking into account the tip configuration. If ``False``, target
+            each well given with the primary nozzle. Defaults to ``True``.
 
         :meta private:
         """
@@ -2083,7 +2092,7 @@ class InstrumentContext(publisher.CommandPublisher):
             last_tip_picked_up_from=self._last_tip_picked_up_from,
             tip_racks=self._tip_racks,
             nozzle_map=self._core.get_nozzle_map(),
-            target_all_wells=visit_every_well,
+            group_wells_for_multi_channel=group_wells,
             current_volume=self.current_volume,
             trash_location=(
                 trash_location if trash_location is not None else self.trash_container

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/src/opentrons/protocol_api/protocol_context.py

@@ -1371,22 +1371,23 @@ class ProtocolContext(CommandPublisher):
             display_color=display_color,
         )
 
-    @requires_version(2, 23)
-    def define_liquid_class(
+    @requires_version(2, 24)
+    def get_liquid_class(
         self,
         name: str,
     ) -> LiquidClass:
         """
-        Define a liquid class for use in the protocol.
-        ..
-            This is intended for Opentrons internal use only and is not a guaranteed API.
+        Get an instance of a built-in liquid class for use in the protocol.
 
-        :meta private:
+        Args:
+            name: Name of an Opentrons-defined liquid class.
+
+        :raises: ``LiquidClassDefinitionDoesNotExist``: if the specified liquid class does not exist.
         """
-        return self._core.define_liquid_class(name=name, version=DEFAULT_LC_VERSION)
+        return self._core.get_liquid_class(name=name, version=DEFAULT_LC_VERSION)
 
     @requires_version(2, 24)
-    def define_custom_liquid_class(
+    def define_liquid_class(
         self,
         name: str,
         properties: Dict[str, Dict[str, TransferPropertiesDict]],

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/src/opentrons/protocol_engine/commands/load_labware.py

@@ -165,25 +165,6 @@ class LoadLabwareImplementation(
                 top_labware_definition=loaded_labware.definition,
                 bottom_labware_id=verified_location.labwareId,
             )
-            # Validate load location is valid for lids
-            if labware_validation.validate_definition_is_lid(
-                definition=loaded_labware.definition
-            ):
-                # This parent is assumed to be compatible, unless the lid enumerates
-                # all its compatible parents and this parent is missing from the list.
-                parent_is_incompatible = (
-                    loaded_labware.definition.compatibleParentLabware is not None
-                    and self._state_view.labware.get_load_name(
-                        verified_location.labwareId
-                    )
-                    not in loaded_labware.definition.compatibleParentLabware
-                )
-
-                if parent_is_incompatible:
-                    raise ValueError(
-                        f"Labware Lid {params.loadName} may not be loaded on parent labware"
-                        f" {self._state_view.labware.get_display_name(verified_location.labwareId)}."
-                    )
 
         # Validate labware for the absorbance reader
         if self._is_loading_to_module(

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/src/opentrons/protocol_engine/resources/labware_validation.py

@@ -48,7 +48,13 @@ def validate_labware_can_be_stacked(
     top_labware_definition: LabwareDefinition, below_labware_load_name: str
 ) -> bool:
     """Validate that the labware being loaded onto is in the above labware's stackingOffsetWithLabware definition."""
-    return below_labware_load_name in top_labware_definition.stackingOffsetWithLabware
+    return (
+        below_labware_load_name in top_labware_definition.stackingOffsetWithLabware
+        or (
+            "default" in top_labware_definition.stackingOffsetWithLabware
+            and top_labware_definition.compatibleParentLabware is None
+        )
+    )
 
 
 def validate_labware_can_be_ondeck(definition: LabwareDefinition) -> bool:

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/src/opentrons/protocol_engine/state/labware.py

@@ -1131,6 +1131,18 @@ class LabwareView:
             raise errors.LabwareCannotBeStackedError(
                 f"Labware {top_labware_definition.parameters.loadName} cannot be loaded onto labware {below_labware.loadName}"
             )
+        elif (
+            labware_validation.validate_definition_is_lid(top_labware_definition)
+            and top_labware_definition.compatibleParentLabware is not None
+            and self.get_load_name(bottom_labware_id)
+            not in top_labware_definition.compatibleParentLabware
+        ):
+            # This parent is assumed to be compatible, unless the lid enumerates
+            # all its compatible parents and this parent is missing from the list.
+            raise ValueError(
+                f"Labware Lid {top_labware_definition.parameters.loadName} may not be loaded on parent labware"
+                f" {self.get_display_name(bottom_labware_id)}."
+            )
         elif isinstance(below_labware.location, ModuleLocation):
             below_definition = self.get_definition(labware_id=below_labware.id)
             if not labware_validation.validate_definition_is_adapter(

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/src/opentrons/protocol_engine/types/liquid_level_detection.py

@@ -27,42 +27,102 @@ class SimulatedProbeResult(BaseModel):
         return data
 
     def __add__(
-        self, other: float | SimulatedProbeResult
+        self, other: float | int | SimulatedProbeResult
     ) -> float | SimulatedProbeResult:
         """Bypass addition and just return self."""
         return self
 
     def __sub__(
-        self, other: float | SimulatedProbeResult
+        self, other: float | int | SimulatedProbeResult
     ) -> float | SimulatedProbeResult:
         """Bypass subtraction and just return self."""
         return self
 
     def __radd__(
-        self, other: float | SimulatedProbeResult
+        self, other: float | int | SimulatedProbeResult
     ) -> float | SimulatedProbeResult:
         """Bypass addition and just return self."""
         return self
 
     def __rsub__(
-        self, other: float | SimulatedProbeResult
+        self, other: float | int | SimulatedProbeResult
     ) -> float | SimulatedProbeResult:
         """Bypass subtraction and just return self."""
         return self
 
-    def __gt__(self, other: float | SimulatedProbeResult) -> bool:
+    def __mul__(
+        self, other: float | int | SimulatedProbeResult
+    ) -> float | SimulatedProbeResult:
+        """Bypass multiplication and just return self."""
+        return self
+
+    def __rmul__(
+        self, other: float | int | SimulatedProbeResult
+    ) -> float | SimulatedProbeResult:
+        """Bypass multiplication and just return self."""
+        return self
+
+    def __truediv__(
+        self, other: float | int | SimulatedProbeResult
+    ) -> float | SimulatedProbeResult:
+        """Bypass division and just return self."""
+        return self
+
+    def __rtruediv__(
+        self, other: float | int | SimulatedProbeResult
+    ) -> float | SimulatedProbeResult:
+        """Bypass division and just return self."""
+        return self
+
+    def __pow__(
+        self, other: float | int | SimulatedProbeResult
+    ) -> float | SimulatedProbeResult:
+        """Bypass exponent math and just return self."""
+        return self
+
+    def __rpow__(
+        self, other: float | int | SimulatedProbeResult
+    ) -> float | SimulatedProbeResult:
+        """Bypass exponent math and just return self."""
+        return self
+
+    def __mod__(
+        self, other: float | int | SimulatedProbeResult
+    ) -> float | SimulatedProbeResult:
+        """Bypass modulus and just return self."""
+        return self
+
+    def __rmod__(
+        self, other: float | int | SimulatedProbeResult
+    ) -> float | SimulatedProbeResult:
+        """Bypass modulus and just return self."""
+        return self
+
+    def __floordiv__(
+        self, other: float | int | SimulatedProbeResult
+    ) -> float | SimulatedProbeResult:
+        """Bypass floor division and just return self."""
+        return self
+
+    def __rfloordiv__(
+        self, other: float | int | SimulatedProbeResult
+    ) -> float | SimulatedProbeResult:
+        """Bypass floor division and just return self."""
+        return self
+
+    def __gt__(self, other: float | int | SimulatedProbeResult) -> bool:
         """Bypass 'greater than' and just return self."""
         return True
 
-    def __lt__(self, other: float | SimulatedProbeResult) -> bool:
+    def __lt__(self, other: float | int | SimulatedProbeResult) -> bool:
         """Bypass 'less than' and just return self."""
         return False
 
-    def __ge__(self, other: float | SimulatedProbeResult) -> bool:
+    def __ge__(self, other: float | int | SimulatedProbeResult) -> bool:
         """Bypass 'greater than or eaqual to' and just return self."""
         return True
 
-    def __le__(self, other: float | SimulatedProbeResult) -> bool:
+    def __le__(self, other: float | int | SimulatedProbeResult) -> bool:
         """Bypass 'less than or equal to' and just return self."""
         return False
 

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/src/opentrons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentrons
-Version: 8.5.0a1
+Version: 8.5.0a2
 Summary: The Opentrons API is a simple framework designed to make writing automated biology lab protocols easy.
 Author: Opentrons
 Author-email: engineering@opentrons.com
@@ -21,7 +21,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 License-File: ../LICENSE
-Requires-Dist: opentrons-shared-data==8.5.0a1
+Requires-Dist: opentrons-shared-data==8.5.0a2
 Requires-Dist: aionotify==0.3.1
 Requires-Dist: anyio<4.0.0,>=3.6.1
 Requires-Dist: jsonschema<4.18.0,>=3.0.1
@@ -35,9 +35,9 @@ Requires-Dist: pyusb==1.2.1
 Requires-Dist: importlib-metadata>=1.0; python_version < "3.8"
 Requires-Dist: packaging>=21.0
 Provides-Extra: ot2-hardware
-Requires-Dist: opentrons-hardware==8.5.0a1; extra == "ot2-hardware"
+Requires-Dist: opentrons-hardware==8.5.0a2; extra == "ot2-hardware"
 Provides-Extra: flex-hardware
-Requires-Dist: opentrons-hardware[FLEX]==8.5.0a1; extra == "flex-hardware"
+Requires-Dist: opentrons-hardware[FLEX]==8.5.0a2; extra == "flex-hardware"
 
 .. _Full API Documentation: http://docs.opentrons.com
 

{opentrons-8.5.0a1 → opentrons-8.5.0a2}/src/opentrons.egg-info/requires.txt

@@ -1,4 +1,4 @@
-opentrons-shared-data==8.5.0a1
+opentrons-shared-data==8.5.0a2
 aionotify==0.3.1
 anyio<4.0.0,>=3.6.1
 jsonschema<4.18.0,>=3.0.1
@@ -15,7 +15,7 @@ packaging>=21.0
 importlib-metadata>=1.0
 
 [flex-hardware]
-opentrons-hardware[FLEX]==8.5.0a1
+opentrons-hardware[FLEX]==8.5.0a2
 
 [ot2-hardware]
-opentrons-hardware==8.5.0a1
+opentrons-hardware==8.5.0a2