Skip to content
This repository has been archived by the owner on Apr 24, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1 from mll-lab/add_scan_fluidx_plate_with_tecan_s…
Browse files Browse the repository at this point in the history
…canner

feat: add scan fluidx plate with tecan scanner logic
  • Loading branch information
simbig authored Jun 27, 2022
2 parents 45bae31 + 69fb0fd commit 5791f7f
Show file tree
Hide file tree
Showing 17 changed files with 6,445 additions and 2,100 deletions.
1 change: 0 additions & 1 deletion .github/FUNDING.yml

This file was deleted.

26 changes: 24 additions & 2 deletions .github/workflows/autoformat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
with:
coverage: none
extensions: mbstring
php-version: 7.4
php-version: 8.1

- run: composer install --no-interaction --no-progress --no-suggest

Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
with:
coverage: none
extensions: mbstring
php-version: 7.4
php-version: 8.1

- run: composer install --no-interaction --no-progress --no-suggest

Expand All @@ -63,3 +63,25 @@ jobs:
- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Apply php-cs-fixer changes

rector:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}

- uses: shivammathur/setup-php@v2
with:
coverage: none
extensions: mbstring
php-version: 8.1

- run: composer install --no-interaction --no-progress --no-suggest

- run: vendor/bin/rector process

- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Apply rector changes
26 changes: 18 additions & 8 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
push:
branches:
- master
schedule:
- cron: '0 0 * * *'

name: "Continuous Integration"

Expand All @@ -23,7 +25,7 @@ jobs:
with:
coverage: none
extensions: mbstring
php-version: 7.4
php-version: 8.1

- name: "Validate composer.json and composer.lock"
run: composer validate --strict
Expand All @@ -42,7 +44,7 @@ jobs:
with:
coverage: none
extensions: mbstring
php-version: 7.4
php-version: 8.1

- name: "Install locked dependencies with composer"
run: composer install --no-interaction --no-progress --no-suggest
Expand All @@ -51,7 +53,7 @@ jobs:
run: vendor/bin/phpstan analyse --configuration=phpstan.neon

tests:
name: "Tests"
name: "Tests - PHP ${{ matrix.php-version }}, Illuminate ${{ matrix.illuminate }}, ${{ matrix.dependencies }}"

runs-on: ubuntu-latest

Expand All @@ -60,11 +62,16 @@ jobs:
php-version:
- 7.4
- 8.0

- 8.1
dependencies:
- lowest
- locked
- highest
illuminate:
- ^8
- ^9
exclude:
- php-version: 7.4
illuminate: ^9

steps:
- name: "Checkout"
Expand All @@ -77,6 +84,9 @@ jobs:
extensions: mbstring
php-version: ${{ matrix.php-version }}

- name: "Install illuminate"
run: composer require "illuminate/support:${{ matrix.illuminate }}" --no-interaction --no-update

- name: "Install lowest dependencies with composer"
if: matrix.dependencies == 'lowest'
run: composer update --prefer-lowest --no-interaction --no-progress --no-suggest
Expand Down Expand Up @@ -106,7 +116,7 @@ jobs:
with:
coverage: pcov
extensions: mbstring
php-version: 7.4
php-version: 8.1

- name: "Install locked dependencies with composer"
run: composer install --no-interaction --no-progress --no-suggest
Expand Down Expand Up @@ -134,10 +144,10 @@ jobs:
with:
coverage: pcov
extensions: mbstring
php-version: 7.4
php-version: 8.1

- name: "Install locked dependencies with composer"
run: composer install --no-interaction --no-progress --no-suggest

- name: "Run mutation tests with infection/infection"
run: vendor/bin/infection --ignore-msi-with-no-mutations --min-covered-msi=100 --min-msi=100
run: vendor/bin/infection
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## v1.0.0

### Added

-
- Add class `FluidXPlate` as a container for the scanned rackId and the scanned wells associated with a Coordinate (96-well format) from `mll-lab/microplate`
- Add class `TecanScanner` to parse a raw scan result string into a `FluidXPlate`
15 changes: 10 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,26 @@
},
"require": {
"php": "^7.4 || ^8",
"illuminate/support": "^7 || ^8",
"mll-lab/microplate": "^3.5",
"illuminate/support": "^8 || ^9",
"mll-lab/microplate": "^3.6",
"mll-lab/php-utils": "^1.2",
"rector/rector": "^0.13.6",
"thecodingmachine/safe": "^1"
},
"require-dev": {
"ergebnis/composer-normalize": "^2",
"infection/infection": "~0.25",
"jangregor/phpstan-prophecy": "^1",
"mll-lab/php-cs-fixer-config": "^4.3",
"nunomaduro/larastan": "^0.7 || ^1",
"orchestra/testbench": "^6 || ^7",
"phpstan/extension-installer": "^1",
"phpstan/phpstan": "^1",
"phpstan/phpstan-deprecation-rules": "^1",
"phpstan/phpstan-phpunit": "^1",
"phpstan/phpstan-strict-rules": "^1",
"phpunit/phpunit": "^9",
"symfony/var-dumper": "^5",
"symfony/var-dumper": "^5 || ^6",
"thecodingmachine/phpstan-safe-rule": "^1.1"
},
"autoload": {
Expand All @@ -49,8 +52,10 @@
]
},
"config": {
"platform": {
"php": "7.4.24"
"allow-plugins": {
"infection/extension-installer": true,
"ergebnis/composer-normalize": true,
"phpstan/extension-installer": true
},
"preferred-install": "dist",
"sort-packages": true
Expand Down
Loading

0 comments on commit 5791f7f

Please sign in to comment.