Skip to content

Commit 911d427

Browse files
committed
Merge branch 'main' into byonoy-luminescence
2 parents 204d7b7 + 9841813 commit 911d427

File tree

114 files changed

+3003
-2283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+3003
-2283
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
os: [ubuntu-latest]
15-
version: [3.9, "3.10", 3.11, 3.12]
15+
version: [3.9, "3.10", 3.11, 3.12, 3.13, 3.14]
1616

1717
name: Tests
1818
runs-on: ${{ matrix.os }}

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ await lh.return_tips()
4747
To run the same protocol on an **Opentrons**, use the following:
4848

4949
```python
50-
from pylabrobot.liquid_handling.backends import OpentronsBackend
50+
from pylabrobot.liquid_handling.backends import OpentronsOT2Backend
5151
deck = Deck.load_from_json_file("opentrons-layout.json")
52-
lh = LiquidHandler(backend=OpentronsBackend(host="x.x.x.x"), deck=deck)
52+
lh = LiquidHandler(backend=OpentronsOT2Backend(host="x.x.x.x"), deck=deck)
5353
```
5454

5555
Or **Tecan** (also works on any operating system!):

docs/api/pylabrobot.liquid_handling.backends.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Hardware
2727
backends.hamilton.base.HamiltonLiquidHandler
2828
backends.hamilton.STAR_backend.STAR
2929
backends.hamilton.vantage_backend.Vantage
30-
backends.opentrons_backend.OpentronsBackend
30+
backends.opentrons_backend.OpentronsOT2Backend
3131
backends.tecan.EVO_backend.EVOBackend
3232

3333
Net

docs/api/pylabrobot.resources.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,7 @@ Opentrons
142142
opentrons
143143
opentrons.deck
144144
opentrons.load
145-
opentrons.plates
146145
opentrons.tip_racks
147-
opentrons.tube_racks
148146

149147

150148
Porvair
411 KB
Loading

docs/index.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ PyHamilton is a Windows only interface to Hamilton's VENUS.
5252
:target: https://byonoy.com
5353
```
5454

55+
```{image} /img/supported_by/logo_nugget.png
56+
:alt: Nugget
57+
:class: company
58+
:target: https://www.nuggetscientific.com
59+
```
60+
5561
## Used by
5662

5763
```{image} /img/used_by/logo_mit.jpg

docs/resources/deck/deck.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ Deck
22
====
33

44
The :class:`~pylabrobot.resources.deck.Deck` class is used to model the decks of liquid handling robots. This is the part that is different for each robot.
5+
6+
You can clear the resources on the deck by calling :meth:`~pylabrobot.resources.deck.Deck.clear`.

docs/resources/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ PLR's `Resource` subclasses in the inheritance tree are:
114114
However, in our discussions, it became evident that the term "labware" has different meanings to different stakeholders
115115
(e.g., "A plate is clearly labware, but is a liquid handler or a plate reader labware?").
116116
As a result, PLR avoids the ambiguous term "labware".</p>
117-
<p><u>Every physical item (describable via its <code>item_x</code>, <code>item_y</code>, <code>item_z</code>) is a "resource"</u>.</p>
117+
<p><u>Every physical item (describable by its physical dimensions <code>size_x</code>, <code>size_y</code>, <code>size_z</code>) is a `Resource`</u>.</p>
118118
</details>
119119

120120
<hr>
@@ -167,6 +167,7 @@ If you cannot find something, please contribute what you are looking for!
167167
:caption: Resource Library
168168
169169
library/agenbio
170+
library/agilent
170171
library/alpaqua
171172
library/azenta
172173
library/bioer

docs/resources/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ In PyLabRobot, a {class}`pylabrobot.resources.resource.Resource` is a piece of l
66

77
While you can instantiate a `Resource` directly, several subclasses of methods exist to provide additional functionality and model specific resource attributes. For example, a {class}`pylabrobot.resources.plate.Plate` has methods for easily accessing {class}`pylabrobot.resources.well.Well`s.
88

9-
The relation between resources is modelled by a tree, specifically an [_arborescence_](<https://en.wikipedia.org/wiki/Arborescence_(graph_theory)>) (a directed, rooted tree). The location of a resource in the tree is a Cartesian coordinate and always relative to the bottom front left corner of its immediate parent. The absolute location can be computed using {meth}`~pylabrobot.resources.resource.Resource.get_absolute_location`. The x-axis is left (smaller) and right (larger); the y-axis is front (small) and back (larger); the z-axis is down (smaller) and up (higher). Each resource has `children` and `parent` attributes that allow you to navigate the tree.
9+
The relation between resources is modelled by a tree, specifically an [_arborescence_](<https://en.wikipedia.org/wiki/Arborescence_(graph_theory)>) (a directed, rooted tree). The location of a resource in the tree is a Cartesian coordinate and always relative to the bottom front left corner of its immediate parent. The absolute location, the location of the resource wrt the root of the tree it is in, can be computed using {meth}`~pylabrobot.resources.resource.Resource.get_absolute_location`. The location wrt any resource between a given one and the root can be computed using {meth}`~pylabrobot.resources.resource.Resource.get_location_wrt`. The x-axis is left (smaller) and right (larger); the y-axis is front (small) and back (larger); the z-axis is down (smaller) and up (higher). Each resource has `children` and `parent` attributes that allow you to navigate the tree.
1010

1111
{class}`pylabrobot.machines.machine.Machine` is a special type of resource that represents a physical machine, such as a liquid handling robot ({class}`pylabrobot.liquid_handling.liquid_handler.LiquidHandler`) or a plate reader ({class}`pylabrobot.plate_reading.plate_reader.PlateReader`). Machines have a `backend` attribute linking to the backend that is responsible for converting PyLabRobot commands into commands that a specific machine can understand. Other than that, Machines, including {class}`pylabrobot.liquid_handling.liquid_handler.LiquidHandler`, are just like any other Resource.
1212

docs/resources/library/agilent.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Agilent
2+
3+
[Company Page](https://www.agilent.com)
4+
5+
## Plates
6+
7+
| Description | Image | PLR definition |
8+
|-|-|-|
9+
| 'agilent_96_wellplate_150uL_Ub'<br>Part no.: 5042-8502<br>[manufacturer website](https://www.agilent.com/store/en_US/Prod-5042-8502/5042-8502) | ![](img/agilent/agilent_96_wellplate_150uL_Ub.jpg) | `agilent_96_wellplate_150uL_Ub` |

0 commit comments

Comments
 (0)