Skip to content

Commit b037c92

Browse files
Merge pull request #10 from fractal-analytics-platform/9-update-dependency-on-fractal-tasks-core
Switch to fractal-task-tools
2 parents fb7dd54 + b0d3488 commit b037c92

File tree

6 files changed

+10
-23
lines changed

6 files changed

+10
-23
lines changed

.github/workflows/build_and_test.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,9 @@ jobs:
3131
with:
3232
pixi-version: v0.44.0
3333

34-
- name: re-create manifest
35-
run: pixi run -e dev python src/ilastik_tasks/dev/create_manifest.py
36-
3734
- name: Check if manifest has changed
38-
run: |
39-
if [ -n "$(git diff --exit-code ./src/ilastik_tasks/__FRACTAL_MANIFEST__.json)" ]; then
40-
echo "__FRACTAL_MANIFEST__.json has changed. Please run 'python src/ilastik_tasks/dev/create_manifest.py' and commit the changes."
41-
exit 1
42-
else
43-
echo "__FRACTAL_MANIFEST__.json has not changed."
44-
fi
45-
35+
run: pixi run fractal-manifest check --package ilastik-tasks
36+
4637
- name: Run tests
4738
run: pixi run -e dev pytest
4839

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,5 @@ pydantic = "==2.8.2"
117117
docstring_parser = "==0.15"
118118
ilastik-core = ">=1.4.2a1,<2"
119119
vigra = ">=1.12.1,<2"
120-
fractal-tasks-core = "==1.4.3"
120+
fractal-tasks-core = "==1.5.3"
121+
fractal-task-tools = "==0.0.12"

src/ilastik_tasks/__FRACTAL_MANIFEST__.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"Pixel Classifier"
99
],
1010
"docs_info": "### Purpose\n\nThis task is used to apply a ilastik pixel classifier to an image.\n\n### Outputs\n\n- The `ilastik_pixel_classification_segmentation`: Generates a new label image named `output_label_name`.\n\n### Limitations\n\n- The task can only be used with single and dual channels pixel classifiers models.",
11+
"type": "parallel",
1112
"executable_parallel": "ilastik_pixel_classification_segmentation.py",
1213
"meta_parallel": {
1314
"cpus_per_task": 8,

src/ilastik_tasks/dev/create_manifest.py

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/ilastik_tasks/dev/task_list.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
"""Contains the list of tasks available to fractal."""
22

3-
from fractal_tasks_core.dev.task_models import ParallelTask
3+
from fractal_task_tools.task_models import ParallelTask
4+
5+
AUTHORS = "Lorenzo Cerrone"
6+
DOCS_LINK = "https://github.com/fractal-analytics-platform/fractal-ilastik-tasks"
47

58
TASK_LIST = [
69
ParallelTask(

src/ilastik_tasks/ilastik_pixel_classification_segmentation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ def check_ilastik_model_channels(shell) -> int:
576576

577577

578578
if __name__ == "__main__":
579-
from fractal_tasks_core.tasks._utils import run_fractal_task
579+
from fractal_task_tools.task_wrapper import run_fractal_task
580580

581581
run_fractal_task(
582582
task_function=ilastik_pixel_classification_segmentation,

0 commit comments

Comments
 (0)