Merge pull request #51 from JuBiotech/base-worklist-refactor

Base worklist refactor
JuBiotech · Nov 27, 2023 · 6e12afb · 6e12afb
2 parents cd7212b + 01d0b6d
commit 6e12afb
Show file tree

Hide file tree

Showing 9 changed files with 907 additions and 786 deletions.
diff --git a/robotools/__init__.py b/robotools/__init__.py
@@ -1,7 +1,8 @@
 from . import evotools, liquidhandling
-from .evotools import InvalidOperationError, Labwares, Tip, Worklist
+from .evotools import EvoWorklist, InvalidOperationError, Labwares, Tip, Worklist
 from .evotools import commands as evo_cmd
 from .evotools import int_to_tip
+from .fluenttools import FluentWorklist
 from .liquidhandling import Labware, Trough, VolumeOverflowError, VolumeUnderflowError
 from .transform import (
     WellRandomizer,
@@ -11,5 +12,6 @@
     make_well_index_dict,
 )
 from .utils import DilutionPlan, get_trough_wells
+from .worklists import BaseWorklist, CompatibilityError
 
-__version__ = "1.7.3"
+__version__ = "1.8.0"
diff --git a/robotools/evotools/__init__.py b/robotools/evotools/__init__.py
@@ -1,3 +1,3 @@
 from robotools.evotools.exceptions import InvalidOperationError
 from robotools.evotools.types import Labwares, Tip, int_to_tip
-from robotools.evotools.worklist import Worklist
+from robotools.evotools.worklist import EvoWorklist, Worklist
diff --git a/robotools/evotools/test_worklist.py b/robotools/evotools/test_worklist.py
@@ -8,14 +8,14 @@
 
 from robotools.evotools.exceptions import InvalidOperationError
 from robotools.evotools.types import Labwares, Tip
-from robotools.evotools.worklist import (
-    Worklist,
+from robotools.evotools.worklist import Worklist
+from robotools.liquidhandling.labware import Labware, Trough
+from robotools.worklists.utils import (
     optimize_partition_by,
     partition_by_column,
     partition_volume,
     prepare_aspirate_dispense_parameters,
 )
-from robotools.liquidhandling.labware import Labware, Trough
 
 
 class TestWorklist: