Skip to content

Commit 5604f26

Browse files
Align wash_scheme=None signature and insert W; in Evo case
⚠ Behavior change for `EvoWorklist.transfer(wash_scheme=None)`: * Previously nothing was inserted * Now `W;` is inserted Closes #77
1 parent c65f110 commit 5604f26

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

robotools/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from .utils import DilutionPlan, get_trough_wells
2121
from .worklists import BaseWorklist, CompatibilityError
2222

23-
__version__ = "1.10.1"
23+
__version__ = "1.11.0"
2424
__all__ = (
2525
"BaseWorklist",
2626
"CompatibilityError",

robotools/evotools/test_worklist.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,16 @@ def test_transfer_2d_volumes_no_wash(self) -> None:
109109
assert wl == [
110110
"A;A;;;1;;20.00;;;;",
111111
"D;B;;;1;;20.00;;;;",
112+
"W;",
112113
"A;A;;;2;;15.30;;;;",
113114
"D;B;;;2;;15.30;;;;",
115+
"W;",
114116
"A;A;;;3;;30.00;;;;",
115117
"D;B;;;3;;30.00;;;;",
118+
"W;",
116119
"A;A;;;4;;17.53;;;;",
117120
"D;B;;;4;;17.53;;;;",
121+
"W;",
118122
]
119123
np.testing.assert_array_equal(
120124
A.volumes,

robotools/evotools/worklist.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ def transfer(
219219
volumes: Union[float, Sequence[float], np.ndarray],
220220
*,
221221
label: Optional[str] = None,
222-
wash_scheme: int = 1,
222+
wash_scheme: Optional[int] = 1,
223223
partition_by: str = "auto",
224224
**kwargs,
225225
) -> None:
@@ -239,8 +239,9 @@ def transfer(
239239
Volume(s) to transfer
240240
label : str
241241
Label of the operation to log into labware history
242-
wash_scheme : int
243-
Wash scheme to apply after every tip use
242+
wash_scheme : int, optional
243+
Wash scheme to apply after every tip use.
244+
If ``None``, a `W;` is inserted.
244245
partition_by : str
245246
one of 'auto' (default), 'source' or 'destination'
246247
'auto': partitioning by source unless the source is a Trough
@@ -306,6 +307,8 @@ def transfer(
306307
nsteps += 1
307308
if wash_scheme is not None:
308309
self.wash(scheme=wash_scheme)
310+
else:
311+
self.append("W;")
309312
naccessed += 1
310313
# LVH: if multiple wells are accessed, don't group across partitions
311314
if npartitions > 1 and naccessed > 1 and not p == npartitions - 1:

robotools/worklists/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ def transfer(
516516
volumes: Union[float, Sequence[float], numpy.ndarray],
517517
*,
518518
label: Optional[str] = None,
519-
wash_scheme: int = 1,
519+
wash_scheme: Optional[int] = 1,
520520
partition_by: str = "auto",
521521
**kwargs,
522522
):

0 commit comments

Comments
 (0)