make disposal_locations public and not public stuff inside private

Opentrons · Feb 29, 2024 · cbb7fb8 · cbb7fb8
1 parent 627bf5e
commit cbb7fb8
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 25 deletions.
diff --git a/api/src/opentrons/commands/commands.py b/api/src/opentrons/commands/commands.py
@@ -6,7 +6,7 @@
 from . import types as command_types
 
 from opentrons.types import Location
-from opentrons.protocol_api._disposal_locations import TrashBin, WasteChute
+from opentrons.protocol_api.disposal_locations import TrashBin, WasteChute
 
 if TYPE_CHECKING:
     from opentrons.protocol_api import InstrumentContext

diff --git a/api/src/opentrons/commands/helpers.py b/api/src/opentrons/commands/helpers.py
@@ -2,7 +2,7 @@
 
 from opentrons.protocol_api.labware import Well, Labware
 from opentrons.protocol_api.module_contexts import ModuleContext
-from opentrons.protocol_api._disposal_locations import TrashBin, WasteChute
+from opentrons.protocol_api.disposal_locations import TrashBin, WasteChute
 from opentrons.protocol_api._types import OffDeckType
 from opentrons.types import Location, DeckLocation
 

diff --git a/api/src/opentrons/commands/types.py b/api/src/opentrons/commands/types.py
@@ -7,7 +7,7 @@
 if TYPE_CHECKING:
     from opentrons.protocol_api import InstrumentContext
     from opentrons.protocol_api.labware import Well
-    from opentrons.protocol_api._disposal_locations import TrashBin, WasteChute
+    from opentrons.protocol_api.disposal_locations import TrashBin, WasteChute
 
 from opentrons.types import Location
 

diff --git a/api/src/opentrons/protocol_api/__init__.py b/api/src/opentrons/protocol_api/__init__.py
@@ -22,9 +22,9 @@
     HeaterShakerContext,
     MagneticBlockContext,
 )
+from .disposal_locations import TrashBin, WasteChute
 from ._liquid import Liquid
 from ._types import OFF_DECK
-from ._disposal_locations import TrashBin, WasteChute
 from ._nozzle_layout import (
     COLUMN,
     ALL,

diff --git a/api/src/opentrons/protocol_api/core/engine/deck_conflict.py b/api/src/opentrons/protocol_api/core/engine/deck_conflict.py
@@ -32,7 +32,7 @@
 from opentrons.protocol_engine.errors.exceptions import LabwareNotLoadedOnModuleError
 from opentrons.protocol_engine.types import StagingSlotLocation, Dimensions
 from opentrons.types import DeckSlotName, StagingSlotName, Point
-from ..._disposal_locations import TrashBin, WasteChute
+from ...disposal_locations import TrashBin, WasteChute
 
 if TYPE_CHECKING:
     from ...labware import Labware

diff --git a/api/src/opentrons/protocol_api/core/engine/instrument.py b/api/src/opentrons/protocol_api/core/engine/instrument.py
@@ -38,7 +38,7 @@
 from ..instrument import AbstractInstrument
 from .well import WellCore
 
-from ..._disposal_locations import TrashBin, WasteChute
+from ...disposal_locations import TrashBin, WasteChute
 
 if TYPE_CHECKING:
     from .protocol import ProtocolCore

diff --git a/api/src/opentrons/protocol_api/core/engine/protocol.py b/api/src/opentrons/protocol_api/core/engine/protocol.py
@@ -51,7 +51,7 @@
 from ... import validation
 from ..._types import OffDeckType
 from ..._liquid import Liquid
-from ..._disposal_locations import TrashBin, WasteChute
+from ...disposal_locations import TrashBin, WasteChute
 from ..protocol import AbstractProtocol
 from ..labware import LabwareLoadParams
 from .labware import LabwareCore

diff --git a/api/src/opentrons/protocol_api/core/instrument.py b/api/src/opentrons/protocol_api/core/instrument.py
@@ -10,7 +10,7 @@
 from opentrons.protocols.api_support.util import FlowRates
 from opentrons.protocol_api._nozzle_layout import NozzleLayout
 
-from .._disposal_locations import TrashBin, WasteChute
+from ..disposal_locations import TrashBin, WasteChute
 from .well import WellCoreType
 
 

diff --git a/api/src/opentrons/protocol_api/core/legacy/legacy_instrument_core.py b/api/src/opentrons/protocol_api/core/legacy/legacy_instrument_core.py
@@ -19,7 +19,7 @@
 from opentrons.protocols.geometry import planning
 from opentrons.protocol_api._nozzle_layout import NozzleLayout
 
-from ..._disposal_locations import TrashBin, WasteChute
+from ...disposal_locations import TrashBin, WasteChute
 from ..instrument import AbstractInstrument
 from .legacy_well_core import LegacyWellCore
 from .legacy_module_core import LegacyThermocyclerCore, LegacyHeaterShakerCore

diff --git a/api/src/opentrons/protocol_api/core/legacy/legacy_protocol_core.py b/api/src/opentrons/protocol_api/core/legacy/legacy_protocol_core.py
@@ -16,9 +16,9 @@
 from opentrons.protocols import labware as labware_definition
 
 from ...labware import Labware
+from ...disposal_locations import TrashBin, WasteChute
 from ..._liquid import Liquid
 from ..._types import OffDeckType
-from ..._disposal_locations import TrashBin, WasteChute
 from ..protocol import AbstractProtocol
 from ..labware import LabwareLoadParams
 

diff --git a/api/src/opentrons/protocol_api/core/legacy_simulator/legacy_instrument_core.py b/api/src/opentrons/protocol_api/core/legacy_simulator/legacy_instrument_core.py
@@ -21,7 +21,7 @@
     UnexpectedTipAttachError,
 )
 
-from ..._disposal_locations import TrashBin, WasteChute
+from ...disposal_locations import TrashBin, WasteChute
 from opentrons.protocol_api._nozzle_layout import NozzleLayout
 
 from ..instrument import AbstractInstrument

diff --git a/api/src/opentrons/protocol_api/core/protocol.py b/api/src/opentrons/protocol_api/core/protocol.py
@@ -19,8 +19,8 @@
 from .labware import LabwareCoreType, LabwareLoadParams
 from .module import ModuleCoreType
 from .._liquid import Liquid
-from .._disposal_locations import TrashBin, WasteChute
 from .._types import OffDeckType
+from ..disposal_locations import TrashBin, WasteChute
 
 if TYPE_CHECKING:
     from ..labware import Labware

diff --git a/api/src/opentrons/protocol_api/create_protocol_context.py b/api/src/opentrons/protocol_api/create_protocol_context.py
@@ -22,7 +22,7 @@
 
 from .protocol_context import ProtocolContext
 from .deck import Deck
-from ._disposal_locations import TrashBin
+from .disposal_locations import TrashBin
 
 from .core.common import ProtocolCore as AbstractProtocolCore
 from .core.legacy.deck import Deck as LegacyDeck

diff --git a/...trons/protocol_api/_disposal_locations.py → ...ntrons/protocol_api/disposal_locations.py b/...trons/protocol_api/_disposal_locations.py → ...ntrons/protocol_api/disposal_locations.py
@@ -26,10 +26,10 @@ class DisposalOffset:
     z: float
 
 
-class DisposalLocation(TypingProtocol):
+class _DisposalLocation(TypingProtocol):
     """Abstract class for disposal location."""
 
-    def top(self, x: float = 0, y: float = 0, z: float = 0) -> DisposalLocation:
+    def top(self, x: float = 0, y: float = 0, z: float = 0) -> _DisposalLocation:
         """Returns a disposal location with a user set offset."""
         ...
 
@@ -74,7 +74,7 @@ def height(self) -> float:
         ...
 
 
-class TrashBin(DisposalLocation):
+class TrashBin(_DisposalLocation):
     """Represents a Flex or OT-2 trash bin.
 
     See :py:meth:`.ProtocolContext.load_trash_bin`.
@@ -158,7 +158,7 @@ def height(self) -> float:
         )
 
 
-class WasteChute(DisposalLocation):
+class WasteChute(_DisposalLocation):
     """Represents a Flex waste chute.
 
     See :py:meth:`.ProtocolContext.load_waste_chute`.

diff --git a/api/src/opentrons/protocol_api/instrument_context.py b/api/src/opentrons/protocol_api/instrument_context.py
@@ -32,7 +32,7 @@
 from .core.engine import ENGINE_CORE_API_VERSION
 from .core.legacy.legacy_instrument_core import LegacyInstrumentCore
 from .config import Clearances
-from ._disposal_locations import TrashBin, WasteChute
+from .disposal_locations import TrashBin, WasteChute
 from ._nozzle_layout import NozzleLayout
 from . import labware, validation
 

diff --git a/api/src/opentrons/protocol_api/protocol_context.py b/api/src/opentrons/protocol_api/protocol_context.py
@@ -52,7 +52,7 @@
 
 from . import validation
 from ._liquid import Liquid
-from ._disposal_locations import TrashBin, WasteChute
+from .disposal_locations import TrashBin, WasteChute
 from .deck import Deck
 from .instrument_context import InstrumentContext
 from .labware import Labware

diff --git a/api/src/opentrons/protocol_api/validation.py b/api/src/opentrons/protocol_api/validation.py
@@ -32,7 +32,7 @@
     ThermocyclerStep,
 )
 
-from ._disposal_locations import TrashBin, WasteChute
+from .disposal_locations import TrashBin, WasteChute
 
 if TYPE_CHECKING:
     from .labware import Well

diff --git a/api/tests/opentrons/protocol_api/core/engine/test_deck_conflict.py b/api/tests/opentrons/protocol_api/core/engine/test_deck_conflict.py
@@ -12,7 +12,7 @@
 from opentrons.motion_planning.adjacent_slots_getters import _MixedTypeSlots
 from opentrons.protocols.api_support.types import APIVersion
 from opentrons.protocol_api import MAX_SUPPORTED_VERSION
-from opentrons.protocol_api._disposal_locations import (
+from opentrons.protocol_api.disposal_locations import (
     TrashBin,
     WasteChute,
     _TRASH_BIN_CUTOUT_FIXTURE,

diff --git a/api/tests/opentrons/protocol_api/core/engine/test_instrument_core.py b/api/tests/opentrons/protocol_api/core/engine/test_instrument_core.py
@@ -31,7 +31,7 @@
     ColumnNozzleLayoutConfiguration,
     AddressableOffsetVector,
 )
-from opentrons.protocol_api._disposal_locations import (
+from opentrons.protocol_api.disposal_locations import (
     TrashBin,
     WasteChute,
     DisposalOffset,

diff --git a/api/tests/opentrons/protocol_api/core/engine/test_protocol_core.py b/api/tests/opentrons/protocol_api/core/engine/test_protocol_core.py
@@ -65,8 +65,8 @@
     ModuleCore,
     load_labware_params,
 )
-from opentrons.protocol_api._disposal_locations import TrashBin, WasteChute
 from opentrons.protocol_api._liquid import Liquid
+from opentrons.protocol_api.disposal_locations import TrashBin, WasteChute
 from opentrons.protocol_api.core.engine.exceptions import InvalidModuleLocationError
 from opentrons.protocol_api.core.engine.module_core import (
     TemperatureModuleCore,

diff --git a/api/tests/opentrons/protocol_api/test_instrument_context.py b/api/tests/opentrons/protocol_api/test_instrument_context.py
@@ -29,7 +29,7 @@
 from opentrons.protocol_api.core.legacy.legacy_instrument_core import (
     LegacyInstrumentCore,
 )
-from opentrons.protocol_api._disposal_locations import TrashBin, WasteChute
+from opentrons.protocol_api.disposal_locations import TrashBin, WasteChute
 from opentrons.protocol_api._nozzle_layout import NozzleLayout
 from opentrons.types import Location, Mount, Point
 

diff --git a/api/tests/opentrons/protocol_api/test_protocol_context.py b/api/tests/opentrons/protocol_api/test_protocol_context.py
@@ -38,7 +38,7 @@
     MagneticModuleCore,
     MagneticBlockCore,
 )
-from opentrons.protocol_api._disposal_locations import TrashBin, WasteChute
+from opentrons.protocol_api.disposal_locations import TrashBin, WasteChute
 from opentrons.protocols.api_support.deck_type import (
     NoTrashDefinedError,
 )