Skip to content

Commit b56ffdd

Browse files
committed
Merge remote-tracking branch 'origin/main' into tecan_spark
# Conflicts: # pylabrobot/io/binary.py # pylabrobot/io/usb.py
2 parents 5dd91c8 + 6875974 commit b56ffdd

70 files changed

Lines changed: 12288 additions & 1104 deletions

File tree

Some content is hidden

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

.github/workflows/docs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: Build and Publish Documentation
33
on:
44
push:
55
branches: main
6+
pull_request:
7+
branches: main
68

79
jobs:
810
build_docs:
@@ -40,6 +42,7 @@ jobs:
4042
run: make llm-docs
4143

4244
- name: Commit generated documentation
45+
if: github.event_name == 'push'
4346
run: |
4447
cd docs/build
4548
git init
@@ -51,6 +54,7 @@ jobs:
5154
git commit -m 'deploy docs'
5255
5356
- name: Push to docs branch
57+
if: github.event_name == 'push'
5458
uses: ad-m/github-push-action@master
5559
with:
5660
github_token: ${{ secrets.GITHUB_TOKEN }}

docs/resources/library/agilent.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
| Description | Image | PLR definition |
88
|-|-|-|
99
| 'agilent_96_wellplate_150uL_Vb'<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_Vb.jpg) | `agilent_96_wellplate_150uL_Vb` |
10+
| 'Agilent_2_reservoir_144mL_Vb'<br>Part no.: 203852-100<br>[manufacturer website](https://www.agilent.com/store/en_US/Prod-203852-100/203852-100?srsltid=AfmBOorcg-D2jAf9VwaEDFvo7ZCQ-_G14cndKReIcpSBsFA0YjxNgDKm) | ![](img/agilent/Agilent_2_reservoir_144mL_Vb.jpg) | `Agilent_2_reservoir_144mL_Vb` |

docs/resources/library/corning.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ Company page: [Corning - Axygen® Brand Products](https://www.corning.com/emea/e
4444
| Description | Image | PLR definition |
4545
|-|-|-|
4646
| 'Cor_Axy_24_wellplate_10mL_Vb'<br>Part no.: P-DW-10ML-24-C-S<br>[manufacturer website](https://ecatalog.corning.com/life-sciences/b2b/UK/en/Genomics-&-Molecular-Biology/Automation-Consumables/Deep-Well-Plate/Axygen%C2%AE-Deep-Well-and-Assay-Plates/p/P-DW-10ML-24-C-S) | ![](img/corning_axygen/Cor_Axy_24_wellplate_10mL_Vb.jpg) | `Cor_Axy_24_wellplate_10mL_Vb` |
47+
| 'Cor_Axy_96_wellplate_500uL_Ub'<br>Part no.: P-96-450V-C-S ("-S" indicates sterile labware)<br>[manufacturer website](https://ecatalog.corning.com/life-sciences/b2c/US/en/Genomics-&-Molecular-Biology/Automation-Consumables/Deep-Well-Plate/Axygen%C2%AE-Deep-Well-and-Assay-Plates/p/P-96-450V-C-S) | ![](img/corning_axygen/Cor_Axy_96_wellplate_500uL_Ub.png) | `Cor_Axy_96_wellplate_500uL_Ub` |
4748

4849
## Corning - Costar
4950

10.2 KB
Loading
460 KB
Loading

docs/resources/library/img/hamilton/hamilton_96_tiprack_300uL_filter_wide.avif renamed to docs/resources/library/img/hamilton/tip_racks/hamilton_96_tiprack_300uL_filter_wide.avif

File renamed without changes.
543 KB
Loading
50.8 KB
Loading

docs/resources/library/img/thermo_fisher/thermo_nunc_1_wellplate_90000uL_Fb_omnitray.jpg.avif renamed to docs/resources/library/img/thermo_fisher/thermo_nunc_1_troughplate_90000uL_Fb_omnitray.jpg.avif

File renamed without changes.

docs/resources/library/nest.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ Wuxi NEST Biotechnology Co., Ltd. a leading life science plastic consumables man
1010
| 'nest_1_troughplate_185000uL_Vb'<br>Part no.: 360101<br>[manufacturer website](https://www.nest-biotech.com/reagent-reserviors/59178415.html)<br>- Material: polypropylene | ![](img/nest/nest_1_troughplate_185000uL_Vb.webp) | `nest_1_troughplate_185000uL_Vb` |
1111
| 'nest_8_troughplate_22000uL_Vb'<br>Part no.: 360101<br>[manufacturer website](https://www.nestscientificusa.com/product/detail/513006470820794368)<br>- Material: polypropylene | ![](img/nest/nest_8_troughplate_22000uL_Vb.jpg) | `nest_8_troughplate_22000uL_Vb` |
1212
| 'nest_12_troughplate_15000uL_Vb'<br>Part no.: 360102<br>[manufacturer website](https://www.nestscientificusa.com/product/detail/513006470820794368)<br>- Material: polypropylene | ![](img/nest/nest_12_troughplate_15000uL_Vb.jpg) | `nest_12_troughplate_15000uL_Vb` |
13+
| 'NEST_96_wellplate_2200uL_Ub'<br>Part no.: 503062<br>[manufacturer website](https://www.nest-biotech.com/deep-well-plates/59253727.html)<br>- Material: polypropylene | ![](img/nest/NEST_96_wellplate_2200uL_Ub.png) | `NEST_96_wellplate_2200uL_Ub` |

0 commit comments

Comments
 (0)