Skip to content

Commit 90c5b9f

Browse files
rickwierengarickwierenga
authored
Remove deprecated resource definitions (_L, _P) (#551)
1 parent 2ece516 commit 90c5b9f

File tree

5 files changed

+1
-235
lines changed

5 files changed

+1
-235
lines changed

‎pylabrobot/resources/azenta/plates.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -80,21 +80,3 @@ def Azenta4titudeFrameStar_96_wellplate_200ul_Vb(name: str, with_lid: bool = Fal
8080
cross_section_type=CrossSectionType.CIRCLE,
8181
),
8282
)
83-
84-
85-
#: Azenta4titudeFrameStar_96_wellplate_Vb_L
86-
def Azenta4titudeFrameStar_96_wellplate_200ul_Vb_L(name: str, with_lid: bool = False) -> Plate:
87-
# https://github.com/PyLabRobot/pylabrobot/issues/252
88-
raise NotImplementedError(
89-
"_L and _P definitions are deprecated. Use "
90-
"Azenta4titudeFrameStar_96_wellplate_200ul_Vb instead."
91-
)
92-
93-
94-
#: Azenta4titudeFrameStar_96_wellplate_Vb_P
95-
def Azenta4titudeFrameStar_96_wellplate_200ul_Vb_P(name: str, with_lid: bool = False) -> Plate:
96-
# https://github.com/PyLabRobot/pylabrobot/issues/252
97-
raise NotImplementedError(
98-
"_L and _P definitions are deprecated. For portrait, use "
99-
"Azenta4titudeFrameStar_96_wellplate_200ul_Vb().rotated(z=90) instead."
100-
)

‎pylabrobot/resources/eppendorf/plates.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -98,18 +98,3 @@ def Eppendorf_96_wellplate_250ul_Vb(name: str, with_lid: bool = False) -> Plate:
9898
compute_height_from_volume=(_compute_height_from_volume_Eppendorf_96_wellplate_250ul_Vb),
9999
),
100100
)
101-
102-
103-
def Eppendorf_96_wellplate_250ul_Vb_L(name: str, with_lid: bool = False) -> Plate:
104-
# https://github.com/PyLabRobot/pylabrobot/issues/252
105-
raise NotImplementedError(
106-
"_L and _P definitions are deprecated. Use " "Eppendorf_96_wellplate_250ul_Vb instead."
107-
)
108-
109-
110-
def Eppendorf_96_wellplate_250ul_Vb_P(name: str, with_lid: bool = False) -> Plate:
111-
# https://github.com/PyLabRobot/pylabrobot/issues/252
112-
raise NotImplementedError(
113-
"_L and _P definitions are deprecated. Use "
114-
"Eppendorf_96_wellplate_250ul_Vb.rotated(90) instead."
115-
)

‎pylabrobot/resources/hamilton/tip_racks.py

Lines changed: 1 addition & 158 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,6 @@ def FourmlTF(name: str, with_tips: bool = True) -> TipRack:
4747
)
4848

4949

50-
def FourmlTF_L(name: str, with_tips: bool = True) -> TipRack:
51-
# https://github.com/PyLabRobot/pylabrobot/issues/252
52-
raise NotImplementedError("_L and _P definitions are deprecated. Use " "FourmlTF instead.")
53-
54-
55-
def FourmlTF_P(name: str, with_tips: bool = True) -> TipRack:
56-
# https://github.com/PyLabRobot/pylabrobot/issues/252
57-
raise NotImplementedError(
58-
"_L and _P definitions are deprecated. Use " "FourmlTF().rotated(z=90) instead."
59-
)
60-
61-
6250
def FivemlT(name: str, with_tips: bool = True) -> TipRack:
6351
"""Tip Rack 24x 5ml Tip landscape oriented"""
6452
return TipRack(
@@ -84,18 +72,6 @@ def FivemlT(name: str, with_tips: bool = True) -> TipRack:
8472
)
8573

8674

87-
def FivemlT_L(name: str, with_tips: bool = True) -> TipRack:
88-
# https://github.com/PyLabRobot/pylabrobot/issues/252
89-
raise NotImplementedError("_L and _P definitions are deprecated. Use " "FivemlT instead.")
90-
91-
92-
def FivemlT_P(name: str, with_tips: bool = True) -> TipRack:
93-
# https://github.com/PyLabRobot/pylabrobot/issues/252
94-
raise NotImplementedError(
95-
"_L and _P definitions are deprecated. Use " "FivemlT().rotated(z=90) instead."
96-
)
97-
98-
9975
def HTF(name: str, with_tips: bool = True) -> TipRack:
10076
"""Tip Rack with 96 1000ul High Volume Tip with filter"""
10177
return TipRack(
@@ -121,18 +97,6 @@ def HTF(name: str, with_tips: bool = True) -> TipRack:
12197
)
12298

12399

124-
def HTF_L(name: str, with_tips: bool = True) -> TipRack:
125-
# https://github.com/PyLabRobot/pylabrobot/issues/252
126-
raise NotImplementedError("_L and _P definitions are deprecated. Use " "HTF instead.")
127-
128-
129-
def HTF_P(name: str, with_tips: bool = True) -> TipRack:
130-
# https://github.com/PyLabRobot/pylabrobot/issues/252
131-
raise NotImplementedError(
132-
"_L and _P definitions are deprecated. Use " "HTF().rotated(z=90) instead."
133-
)
134-
135-
136100
def HTF_WIDE(name: str, with_tips: bool = True) -> TipRack:
137101
"""Tip Rack with 96 1000ul High Volume Tip with filter"""
138102
return TipRack(
@@ -158,10 +122,6 @@ def HTF_WIDE(name: str, with_tips: bool = True) -> TipRack:
158122
)
159123

160124

161-
def HTF_L_WIDE(name: str, with_tips: bool = True) -> TipRack:
162-
raise NotImplementedError("_L and _P definitions are deprecated. Use " "HTF_WIDE instead.")
163-
164-
165125
def HTF_ULTRAWIDE(name: str, with_tips: bool = True) -> TipRack:
166126
"""Tip Rack with 96 1000ul High Volume Tip with filter"""
167127
return TipRack(
@@ -187,10 +147,6 @@ def HTF_ULTRAWIDE(name: str, with_tips: bool = True) -> TipRack:
187147
)
188148

189149

190-
def HTF_L_ULTRAWIDE(name: str, with_tips: bool = True) -> TipRack:
191-
raise NotImplementedError("_L and _P definitions are deprecated. Use " "HTF_ULTRAWIDE instead.")
192-
193-
194150
def HT(name: str, with_tips: bool = True) -> TipRack:
195151
"""Tip Rack with 96 1000ul High Volume Tip"""
196152
return TipRack(
@@ -216,18 +172,6 @@ def HT(name: str, with_tips: bool = True) -> TipRack:
216172
)
217173

218174

219-
def HT_L(name: str, with_tips: bool = True) -> TipRack:
220-
# https://github.com/PyLabRobot/pylabrobot/issues/252
221-
raise NotImplementedError("_L and _P definitions are deprecated. Use " "HT instead.")
222-
223-
224-
def HT_P(name: str, with_tips: bool = True) -> TipRack:
225-
# https://github.com/PyLabRobot/pylabrobot/issues/252
226-
raise NotImplementedError(
227-
"_L and _P definitions are deprecated. Use " "HT().rotated(z=90) instead."
228-
)
229-
230-
231175
def LTF(name: str, with_tips: bool = True) -> TipRack:
232176
"""Tip Rack with 96 10ul Low Volume Tip with filter"""
233177
return TipRack(
@@ -253,18 +197,6 @@ def LTF(name: str, with_tips: bool = True) -> TipRack:
253197
)
254198

255199

256-
def LTF_L(name: str, with_tips: bool = True) -> TipRack:
257-
# https://github.com/PyLabRobot/pylabrobot/issues/252
258-
raise NotImplementedError("_L and _P definitions are deprecated. Use " "LTF instead.")
259-
260-
261-
def LTF_P(name: str, with_tips: bool = True) -> TipRack:
262-
# https://github.com/PyLabRobot/pylabrobot/issues/252
263-
raise NotImplementedError(
264-
"_L and _P definitions are deprecated. Use " "LTF().rotated(z=90) instead."
265-
)
266-
267-
268200
def LT(name: str, with_tips: bool = True) -> TipRack:
269201
"""Tip Rack with 96 10ul Low Volume Tip"""
270202
return TipRack(
@@ -290,18 +222,6 @@ def LT(name: str, with_tips: bool = True) -> TipRack:
290222
)
291223

292224

293-
def LT_L(name: str, with_tips: bool = True) -> TipRack:
294-
# https://github.com/PyLabRobot/pylabrobot/issues/252
295-
raise NotImplementedError("_L and _P definitions are deprecated. Use " "LT instead.")
296-
297-
298-
def LT_P(name: str, with_tips: bool = True) -> TipRack:
299-
# https://github.com/PyLabRobot/pylabrobot/issues/252
300-
raise NotImplementedError(
301-
"_L and _P definitions are deprecated. Use " "LT().rotated(z=90) instead."
302-
)
303-
304-
305225
def STF(name: str, with_tips: bool = True) -> TipRack:
306226
"""Tip Rack with 96 300ul Standard Volume Tip with filter"""
307227
return TipRack(
@@ -327,26 +247,14 @@ def STF(name: str, with_tips: bool = True) -> TipRack:
327247
)
328248

329249

330-
def STF_L(name: str, with_tips: bool = True) -> TipRack:
331-
# https://github.com/PyLabRobot/pylabrobot/issues/252
332-
raise NotImplementedError("_L and _P definitions are deprecated. Use " "STF instead.")
333-
334-
335-
def STF_P(name: str, with_tips: bool = True) -> TipRack:
336-
# https://github.com/PyLabRobot/pylabrobot/issues/252
337-
raise NotImplementedError(
338-
"_L and _P definitions are deprecated. Use " "STF().rotated(z=90) instead."
339-
)
340-
341-
342250
def STF_Slim(name: str, with_tips: bool = True) -> TipRack:
343251
"""Tip Rack with 96 300ul Slim Standard Volume Tip with filter"""
344252
return TipRack(
345253
name=name,
346254
size_x=122.4,
347255
size_y=82.6,
348256
size_z=20.0,
349-
model=STF_Slim_L.__name__,
257+
model=STF_Slim.__name__,
350258
ordered_items=create_ordered_items_2d(
351259
TipSpot,
352260
num_items_x=12,
@@ -364,18 +272,6 @@ def STF_Slim(name: str, with_tips: bool = True) -> TipRack:
364272
)
365273

366274

367-
def STF_Slim_L(name: str, with_tips: bool = True) -> TipRack:
368-
# https://github.com/PyLabRobot/pylabrobot/issues/252
369-
raise NotImplementedError("_L and _P definitions are deprecated. Use " "STF_Slim instead.")
370-
371-
372-
def STF_Slim_P(name: str, with_tips: bool = True) -> TipRack:
373-
# https://github.com/PyLabRobot/pylabrobot/issues/252
374-
raise NotImplementedError(
375-
"_L and _P definitions are deprecated. Use " "STF_Slim().rotated(z=90) instead."
376-
)
377-
378-
379275
def ST(name: str, with_tips: bool = True) -> TipRack:
380276
"""Tip Rack with 96 300ul Standard Volume Tip"""
381277
return TipRack(
@@ -401,18 +297,6 @@ def ST(name: str, with_tips: bool = True) -> TipRack:
401297
)
402298

403299

404-
def ST_L(name: str, with_tips: bool = True) -> TipRack:
405-
# https://github.com/PyLabRobot/pylabrobot/issues/252
406-
raise NotImplementedError("_L and _P definitions are deprecated. Use " "ST instead.")
407-
408-
409-
def ST_P(name: str, with_tips: bool = True) -> TipRack:
410-
# https://github.com/PyLabRobot/pylabrobot/issues/252
411-
raise NotImplementedError(
412-
"_L and _P definitions are deprecated. Use " "ST().rotated(z=90) instead."
413-
)
414-
415-
416300
def TIP_50ul_w_filter(name: str, with_tips: bool = True) -> TipRack:
417301
"""Tip Rack with 96 50ul Tip with filter"""
418302
return TipRack(
@@ -438,20 +322,6 @@ def TIP_50ul_w_filter(name: str, with_tips: bool = True) -> TipRack:
438322
)
439323

440324

441-
def TIP_50ul_w_filter_L(name: str, with_tips: bool = True) -> TipRack:
442-
# https://github.com/PyLabRobot/pylabrobot/issues/252
443-
raise NotImplementedError(
444-
"_L and _P definitions are deprecated. Use " "TIP_50ul_w_filter instead."
445-
)
446-
447-
448-
def TIP_50ul_w_filter_P(name: str, with_tips: bool = True) -> TipRack:
449-
# https://github.com/PyLabRobot/pylabrobot/issues/252
450-
raise NotImplementedError(
451-
"_L and _P definitions are deprecated. Use " "TIP_50ul_w_filter().rotated(z=90) instead."
452-
)
453-
454-
455325
def TIP_50ul(name: str, with_tips: bool = True) -> TipRack:
456326
"""Tip Rack with 96 50ul Tip"""
457327
return TipRack(
@@ -477,18 +347,6 @@ def TIP_50ul(name: str, with_tips: bool = True) -> TipRack:
477347
)
478348

479349

480-
def TIP_50ul_L(name: str, with_tips: bool = True) -> TipRack:
481-
# https://github.com/PyLabRobot/pylabrobot/issues/252
482-
raise NotImplementedError("_L and _P definitions are deprecated. Use " "TIP_50ul instead.")
483-
484-
485-
def TIP_50ul_P(name: str, with_tips: bool = True) -> TipRack:
486-
# https://github.com/PyLabRobot/pylabrobot/issues/252
487-
raise NotImplementedError(
488-
"_L and _P definitions are deprecated. Use " "TIP_50ul().rotated(z=90) instead."
489-
)
490-
491-
492350
def Hamilton_96_tiprack_50ul_NTR(name: str, with_tips: bool = True) -> NestedTipRack:
493351
"""Nested Tip Rack with 96 50ul Tip"""
494352
return NestedTipRack(
@@ -514,18 +372,3 @@ def Hamilton_96_tiprack_50ul_NTR(name: str, with_tips: bool = True) -> NestedTip
514372
),
515373
with_tips=with_tips,
516374
)
517-
518-
519-
def Hamilton_96_tiprack_50ul_NTR_L(name: str, with_tips: bool = True) -> NestedTipRack:
520-
# https://github.com/PyLabRobot/pylabrobot/issues/252
521-
raise NotImplementedError(
522-
"_L and _P definitions are deprecated. Use " "Hamilton_96_tiprack_50ul_NTR instead."
523-
)
524-
525-
526-
def Hamilton_96_tiprack_50ul_NTR_P(name: str, with_tips: bool = True) -> NestedTipRack:
527-
# https://github.com/PyLabRobot/pylabrobot/issues/252
528-
raise NotImplementedError(
529-
"_L and _P definitions are deprecated. Use "
530-
"Hamilton_96_tiprack_50ul_NTR().rotated(z=90) instead."
531-
)

‎pylabrobot/resources/porvair/plates.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -94,22 +94,6 @@ def Porvair_6_reservoir_47ml_Vb(name: str, with_lid: bool = False) -> Plate:
9494
)
9595

9696

97-
#: Porvair_6_reservoir_47ml_Vb_L
98-
def Porvair_6_reservoir_47ml_Vb_L(name: str, with_lid: bool = False) -> Plate:
99-
# https://github.com/PyLabRobot/pylabrobot/issues/252
100-
raise NotImplementedError(
101-
"_L and _P definitions are deprecated. Use " "Porvair_6_reservoir_47ml_Vb instead."
102-
)
103-
104-
105-
#: Porvair_6_reservoir_47ml_Vb_P
106-
def Porvair_6_reservoir_47ml_Vb_P(name: str, with_lid: bool = False) -> Plate:
107-
# https://github.com/PyLabRobot/pylabrobot/issues/252
108-
raise NotImplementedError(
109-
"_L and _P definitions are deprecated. Use " "Porvair_6_reservoir_47ml_Vb.rotated(90) instead."
110-
)
111-
112-
11397
def Porvair_24_wellplate_Vb(name: str, lid: Optional[Lid] = None) -> Plate:
11498
"""
11599
Porvair cat. no.: 390108

‎pylabrobot/resources/thermo_fisher/plates.py

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -118,21 +118,6 @@ def Thermo_TS_96_wellplate_1200ul_Rb(name: str, with_lid: bool = False) -> Plate
118118
)
119119

120120

121-
def Thermo_TS_96_wellplate_1200ul_Rb_L(name: str, with_lid: bool = False) -> Plate:
122-
# https://github.com/PyLabRobot/pylabrobot/issues/252
123-
raise NotImplementedError(
124-
"_L and _P definitions are deprecated. Use Thermo_TS_96_wellplate_1200ul_Rb instead."
125-
)
126-
127-
128-
def Thermo_TS_96_wellplate_1200ul_Rb_P(name: str, with_lid: bool = False) -> Plate:
129-
# https://github.com/PyLabRobot/pylabrobot/issues/252
130-
raise NotImplementedError(
131-
"_L and _P definitions are deprecated. Use "
132-
"Thermo_TS_96_wellplate_1200ul_Rb().rotated(z=90) instead."
133-
)
134-
135-
136121
# # # # # # # # # # Thermo_AB_96_wellplate_300ul_Vb_EnduraPlate # # # # # # # # # #
137122

138123

@@ -232,19 +217,6 @@ def Thermo_AB_96_wellplate_300ul_Vb_EnduraPlate(name: str, with_lid: bool = Fals
232217
)
233218

234219

235-
def Thermo_AB_96_wellplate_300ul_Vb_EnduraPlate_L(name: str, with_lid: bool = False) -> Plate:
236-
raise NotImplementedError(
237-
"_L and _P definitions are deprecated. Use Thermo_AB_96_wellplate_300ul_Vb_EnduraPlate instead."
238-
)
239-
240-
241-
def Thermo_AB_96_wellplate_300ul_Vb_EnduraPlate_P(name: str, with_lid: bool = False) -> Plate:
242-
raise NotImplementedError(
243-
"_L and _P definitions are deprecated. Use "
244-
"Thermo_AB_96_wellplate_300ul_Vb_EnduraPlate.rotated(90) instead."
245-
)
246-
247-
248220
def Thermo_Nunc_96_well_plate_1300uL_Rb(name: str) -> Plate:
249221
"""
250222
- Part no.: 260252

0 commit comments

Comments
 (0)