opentrons 8.6.0a6__py3-none-any.whl → 8.6.0a8__py3-none-any.whl

opentrons/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '8.6.0a6'
-__version_tuple__ = version_tuple = (8, 6, 0, 'a6')
+__version__ = version = '8.6.0a8'
+__version_tuple__ = version_tuple = (8, 6, 0, 'a8')
 
 __commit_id__ = commit_id = None

opentrons/protocol_engine/state/modules.py

@@ -1261,7 +1261,22 @@ class ModuleView:
             if existing_def.model == model or model in existing_def.compatibleWith:
                 return existing_mod_in_slot
 
-            else:
+            # FIXME(sfoster): This is a bad hack. This code should check that these can coexist
+            # through some data-driven means. Or this code should, in fact, not exist at all,
+            # since it's probably for setup commands that we don't use anymore, and doesn't
+            # check serial numbers and therefore would fail if there was mroe than one of
+            # a given module loaded across the deck and the one in this location was not the
+            # one that was being requested.
+            elif not (
+                (
+                    ModuleModel.is_flex_stacker(existing_def.model)
+                    and ModuleModel.is_magnetic_block(model)
+                )
+                or (
+                    ModuleModel.is_magnetic_block(existing_def.model)
+                    and ModuleModel.is_flex_stacker(model)
+                )
+            ):
                 _err = f" present in {location}"
                 raise errors.ModuleAlreadyPresentError(
                     f"A {existing_def.model.value} is already" + _err

{opentrons-8.6.0a6.dist-info → opentrons-8.6.0a8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opentrons
-Version: 8.6.0a6
+Version: 8.6.0a8
 Summary: The Opentrons API is a simple framework designed to make writing automated biology lab protocols easy.
 Project-URL: opentrons.com, https://www.opentrons.com
 Project-URL: Source Code On Github, https://github.com/Opentrons/opentrons/tree/edge/api
@@ -24,7 +24,7 @@ Requires-Dist: click<9,>=8.0.0
 Requires-Dist: importlib-metadata>=1.0; python_version < '3.8'
 Requires-Dist: jsonschema<4.18.0,>=3.0.1
 Requires-Dist: numpy<2,>=1.20.0
-Requires-Dist: opentrons-shared-data==8.6.0a6
+Requires-Dist: opentrons-shared-data==8.6.0a8
 Requires-Dist: packaging>=21.0
 Requires-Dist: pydantic-settings<3,>=2
 Requires-Dist: pydantic<3,>=2.0.0
@@ -32,6 +32,6 @@ Requires-Dist: pyserial>=3.5
 Requires-Dist: pyusb==1.2.1
 Requires-Dist: typing-extensions<5,>=4.0.0
 Provides-Extra: flex-hardware
-Requires-Dist: opentrons-hardware[flex]==8.6.0a6; extra == 'flex-hardware'
+Requires-Dist: opentrons-hardware[flex]==8.6.0a8; extra == 'flex-hardware'
 Provides-Extra: ot2-hardware
-Requires-Dist: opentrons-hardware==8.6.0a6; extra == 'ot2-hardware'
+Requires-Dist: opentrons-hardware==8.6.0a8; extra == 'ot2-hardware'

{opentrons-8.6.0a6.dist-info → opentrons-8.6.0a8.dist-info}/RECORD

@@ -1,5 +1,5 @@
 opentrons/__init__.py,sha256=TQ_Ca_zzAM3iLzAysWKkFkQHG8-imihxDPQbLCYrf-E,4533
-opentrons/_version.py,sha256=ik3RXUUAoXvSc0OH3Cy8Ho-2os43zXhg0ipyoZnPz5M,712
+opentrons/_version.py,sha256=ooa8UMcRtwsxkpN95LFAxQ4aTlhsFee-Yo0Tzhbyqag,712
 opentrons/execute.py,sha256=Y88qICDiHWQjU0L4Ou7DI5OXXu7zZcdkUvNUYmZqIfc,29282
 opentrons/legacy_broker.py,sha256=XnuEBBlrHCThc31RFW2UR0tGqctqWZ-CZ9vSC4L9whU,1553
 opentrons/ordered_set.py,sha256=g-SB3qA14yxHu9zjGyc2wC7d2TUCBE6fKZlHAtbPzI8,4082
@@ -466,7 +466,7 @@ opentrons/protocol_engine/state/inner_well_math_utils.py,sha256=UhemsPpcuKwVc-iG
 opentrons/protocol_engine/state/labware.py,sha256=bmNOa6vDFXa-Iow4x_1zNa3tIcNkUvu1OCg3ED2E4i4,59936
 opentrons/protocol_engine/state/liquid_classes.py,sha256=u_z75UYdiFAKG0yB3mr1il4T3qaS0Sotq8sL7KLODP8,2990
 opentrons/protocol_engine/state/liquids.py,sha256=NoesktcQdJUjIVmet1uqqJPf-rzbo4SGemXwQC295W0,2338
-opentrons/protocol_engine/state/modules.py,sha256=2P_3Ks_9hWvtVgttnUqS5wcmWLmMzn2Tjp8CosnFXYM,60737
+opentrons/protocol_engine/state/modules.py,sha256=SM_6j3YfZV4ZXWTGjwxQIVH-jtHEI-YFuJtoMyPBReo,61599
 opentrons/protocol_engine/state/motion.py,sha256=pWt28-vBaO6dz_rtvoliUsGDvls_ML6sRfDOwmD0F7g,15086
 opentrons/protocol_engine/state/pipettes.py,sha256=nXXQqeBIArPu0rEz-Y6OqA_F23A7uxPHVC2JfaJFH_g,38186
 opentrons/protocol_engine/state/state.py,sha256=X8Sb2HN01nmNBY1Rw6qeLOjSuIWTbiq4g5otsd4u6A0,15600
@@ -594,8 +594,8 @@ opentrons/util/linal.py,sha256=IlKAP9HkNBBgULeSf4YVwSKHdx9jnCjSr7nvDvlRALg,5753
 opentrons/util/logging_config.py,sha256=7et4YYuQdWdq_e50U-8vFS_QyNBRgdnqPGAQJm8qrIo,9954
 opentrons/util/logging_queue_handler.py,sha256=ZsSJwy-oV8DXwpYiZisQ1PbYwmK2cOslD46AcyJ1E4I,2484
 opentrons/util/performance_helpers.py,sha256=ew7H8XD20iS6-2TJAzbQeyzStZkkE6PzHt_Adx3wbZQ,5172
-opentrons-8.6.0a6.dist-info/METADATA,sha256=q8vpRhKqteyyfr9Yejh4rWue-vhSb7RIXdOaYCReleQ,1607
-opentrons-8.6.0a6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-opentrons-8.6.0a6.dist-info/entry_points.txt,sha256=fTa6eGCYkvOtv0ov-KVE8LLGetgb35LQLF9x85OWPVw,106
-opentrons-8.6.0a6.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-opentrons-8.6.0a6.dist-info/RECORD,,
+opentrons-8.6.0a8.dist-info/METADATA,sha256=dxPxdBB9-hH0rToKMpMBvWCA4c3StaAN3bVCXMKwcf0,1607
+opentrons-8.6.0a8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+opentrons-8.6.0a8.dist-info/entry_points.txt,sha256=fTa6eGCYkvOtv0ov-KVE8LLGetgb35LQLF9x85OWPVw,106
+opentrons-8.6.0a8.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+opentrons-8.6.0a8.dist-info/RECORD,,