Skip to content

Commit b63681d

Browse files
Ngio projection task (#937)
* upgrade to ngio>=0.2 * refactor projection task to use ngio 0.2 * new testing suite ngio based
1 parent 59b61a7 commit b63681d

20 files changed

+1243
-974
lines changed

.github/workflows/ci_pip.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
run: python -m pip install pytest devtools jsonschema requests wget pooch
4141

4242
- name: Test core library with pytest
43-
run: python -m pytest tests --ignore tests/tasks --ignore tests/dev
43+
run: python -m pytest tests --ignore tests/tasks --ignore tests/dev --ignore tests/tasks_v2
4444

4545
tests_tasks:
4646
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
@@ -78,4 +78,4 @@ jobs:
7878
key: pooch-cache
7979

8080
- name: Test tasks with pytest
81-
run: python -m pytest tests/dev tests/tasks -s --log-cli-level info
81+
run: python -m pytest tests/dev tests/tasks tests/tasks_v2 -s --log-cli-level info

.github/workflows/ci_poetry.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Test core library with pytest
4747
env:
4848
COVERAGE_FILE: coverage-data-core-${{ matrix.python-version }}
49-
run: poetry run coverage run -m pytest tests --ignore tests/tasks --ignore tests/dev
49+
run: poetry run coverage run -m pytest tests --ignore tests/tasks --ignore tests/dev --ignore tests/tasks_v2
5050

5151
- name: Upload coverage data
5252
uses: actions/upload-artifact@v4
@@ -102,7 +102,7 @@ jobs:
102102
- name: Test tasks with pytest
103103
env:
104104
COVERAGE_FILE: coverage-data-tasks-${{ matrix.python-version }}
105-
run: poetry run coverage run -m pytest tests/dev tests/tasks
105+
run: poetry run coverage run -m pytest tests/dev tests/tasks tests/tasks_v2
106106

107107
- name: Upload coverage data
108108
uses: actions/upload-artifact@v4

.github/workflows/manifest_external_packages.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ jobs:
3939
cmd_create_manifest: 'python src/scmultiplex/dev/create_manifest.py'
4040
custom_dependencies: 'image_registration'
4141

42-
- package: fractal-helper-tasks
43-
github_repo: jluethi/fractal-helper-tasks
44-
github_branch: main
45-
manifest_path: src/fractal_helper_tasks/__FRACTAL_MANIFEST__.json
46-
cmd_install: 'python -m pip install -e .'
47-
cmd_create_manifest: 'python src/fractal_helper_tasks/dev/create_manifest.py'
48-
custom_dependencies: ''
42+
#- package: fractal-helper-tasks
43+
# github_repo: jluethi/fractal-helper-tasks
44+
# github_branch: main
45+
# manifest_path: src/fractal_helper_tasks/__FRACTAL_MANIFEST__.json
46+
# cmd_install: 'python -m pip install -e .'
47+
# cmd_create_manifest: 'python src/fractal_helper_tasks/dev/create_manifest.py'
48+
# custom_dependencies: ''
4949

5050
- package: APx_fractal_task_collection
5151
github_repo: Apricot-Therapeutics/APx_fractal_task_collection

.pre-commit-config.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,10 @@ repos:
2323
hooks:
2424
- id: bandit
2525
args: ["-x", "tests/*"]
26+
- repo: local
27+
hooks:
28+
- id: grep-for-devtools
29+
name: Check for devtools in fractal_tasks_core
30+
entry: bash -c 'for file in "$@"; do if grep -n "devtools" "$file"; then echo "$file" && exit 1; fi; done' --
31+
language: system
32+
files: fractal_tasks_core/

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
**Note**: Numbers like (\#123) point to closed Pull Requests on the fractal-tasks-core repository.
22

3+
# 1.5.0 (a2 prerelease)
4+
* Dependencies:
5+
* Bump `ngio` to `>=0.2.2,<0.3.0`.
6+
* Tasks:
7+
* Refactor `projection` task to use the new `ngio` API.
8+
* Refactor `copy_ome_zarr_plate` init task to support the upcoming flexibility.
9+
* Testing:
10+
* Add new (redundand) `ngio` based testing
11+
312
# 1.5.0 (a1 prerelease)
413

514
* Dependencies:

fractal_tasks_core/__FRACTAL_MANIFEST__.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -676,11 +676,17 @@
676676
"title": "Method",
677677
"description": "Choose which method to use for intensity projection along the Z axis. mip is the default and performs a maximum intensity projection. minip performs a minimum intensity projection, meanip a mean intensity projection and sumip a sum intensity projection."
678678
},
679-
"overwrite": {
679+
"overwrite_images": {
680680
"default": false,
681-
"title": "Overwrite",
681+
"title": "Overwrite Images",
682682
"type": "boolean",
683-
"description": "If `True`, overwrite the task output."
683+
"description": "If `True`, overwrite the MIP images if they are already present in the new OME-Zarr Plate."
684+
},
685+
"re_initialize_plate": {
686+
"default": false,
687+
"title": "Re Initialize Plate",
688+
"type": "boolean",
689+
"description": "If `True`, re-initialize the plate, deleting all existing wells and images. If `False`, the task will only incrementally add new wells and images to the plate."
684690
}
685691
},
686692
"required": [

0 commit comments

Comments
 (0)