fractal-task-tools 0.0.9__py3-none-any.whl → 0.0.11__py3-none-any.whl

fractal_task_tools/__init__.py

@@ -2,4 +2,4 @@ import logging
 
 logging.basicConfig(level=logging.INFO)
 
-__VERSION__ = "0.0.9"
+__VERSION__ = "0.0.11"

fractal_task_tools/_cli.py

@@ -47,6 +47,19 @@ for subparser in (create_manifest_parser, check_manifest_parser):
         default="dev.task_list",
         required=False,
     )
+
+    subparser.add_argument(
+        "--fractal-server-2-13",
+        action="store_true",
+        help=(
+            "If set, produce a manifest which is compatible with "
+            "fractal-server<2.14 (that is, exclude tasks' `type`s from "
+            "manifest and forbid converter types."
+        ),
+        default=False,
+        required=False,
+    )
+
 check_manifest_parser.add_argument(
     "--ignore-keys-order",
     type=bool,
@@ -78,6 +91,7 @@ def main():
         manifest = create_manifest(
             raw_package_name=args.package,
             task_list_path=args.task_list_path,
+            fractal_server_2_13=args.fractal_server_2_13,
         )
         write_manifest_to_file(
             raw_package_name=args.package,
@@ -88,6 +102,7 @@ def main():
         manifest = create_manifest(
             raw_package_name=args.package,
             task_list_path=args.task_list_path,
+            fractal_server_2_13=args.fractal_server_2_13,
         )
         check_manifest(
             raw_package_name=args.package,

fractal_task_tools/_create_manifest.py

@@ -21,6 +21,7 @@ def create_manifest(
     *,
     raw_package_name: str,
     task_list_path: str,
+    fractal_server_2_13: bool = False,
 ) -> dict[str, Any]:
     """
     Create the package manifest based on a `task_list.py` module
@@ -32,6 +33,10 @@ def create_manifest(
         task_list_path:
             Relative path to the `task_list.py` module, with respect to the
             package root (example `dev.task_list`).
+        fractal_server_2_13:
+            If set, produce a manifest which is compatible with
+            fractal-server<2.14 (that is, exclude tasks' `type`s from manifest
+            and forbid converter types."
 
     Returns:
         Task-package manifest.
@@ -98,7 +103,16 @@ def create_manifest(
             },
             exclude_unset=True,
         )
-        task_dict["type"] = task_obj.type
+        if fractal_server_2_13 and task_obj.type in [
+            "converter_compound",
+            "converter_non_parallel",
+        ]:
+            raise ValueError(
+                f"Invalid task type {task_obj.type} "
+                f"(with {fractal_server_2_13=})."
+            )
+        if not fractal_server_2_13:
+            task_dict["type"] = task_obj.type
 
         # Copy some properties from `task_obj` to `task_dict`
         if task_obj.executable_non_parallel is not None:

{fractal_task_tools-0.0.9.dist-info → fractal_task_tools-0.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractal-task-tools
-Version: 0.0.9
+Version: 0.0.11
 Summary: Shared tools for Fractal tasks
 Author-email: Tommaso Comparin <tommaso.comparin@exact-lab.it>
 License: BSD-3-Clause
@@ -11,19 +11,20 @@ Requires-Python: <3.13,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pydantic<=2.8.2,>=2.0.0
-Requires-Dist: docstring-parser==0.15
+Requires-Dist: docstring-parser<=0.16,>=0.15
 Provides-Extra: dev
 Requires-Dist: bumpver==2024.1130; extra == "dev"
 Requires-Dist: devtools==0.12.2; extra == "dev"
 Requires-Dist: pytest<9.0.0,>=8.3.0; extra == "dev"
 Requires-Dist: coverage<7.7.0,>=7.6.0; extra == "dev"
-Requires-Dist: mkdocs==1.5.2; extra == "dev"
-Requires-Dist: mkdocs-material==9.1.21; extra == "dev"
-Requires-Dist: mkdocs-literate-nav==0.5.0; extra == "dev"
-Requires-Dist: mkdocs-gen-files==0.4.0; extra == "dev"
-Requires-Dist: mkdocs-section-index==0.3.5; extra == "dev"
-Requires-Dist: mkdocstrings[python]==0.25.2; extra == "dev"
-Requires-Dist: mkdocs-include-markdown-plugin<6.0.0,>=5.0.0; extra == "dev"
+Provides-Extra: docs
+Requires-Dist: mkdocs<1.7.0,>=1.6.0; extra == "docs"
+Requires-Dist: mkdocs-material<9.7.0,>=9.6.0; extra == "docs"
+Requires-Dist: mkdocs-literate-nav<0.7.0,>=0.6.2; extra == "docs"
+Requires-Dist: mkdocs-gen-files<0.6.0,>=0.5.0; extra == "docs"
+Requires-Dist: mkdocs-section-index<0.4.0,>=0.3.9; extra == "docs"
+Requires-Dist: mkdocstrings[python]<0.30.0,>=0.29.0; extra == "docs"
+Requires-Dist: mkdocs-include-markdown-plugin<8.0.0,>=7.0.0; extra == "docs"
 Dynamic: license-file
 
 # Fractal task tools

{fractal_task_tools-0.0.9.dist-info → fractal_task_tools-0.0.11.dist-info}/RECORD

@@ -1,8 +1,8 @@
-fractal_task_tools/__init__.py,sha256=sLICpL6OJuGAjnPq5Y06u4kqhfz653Ng7rRdEl3mlxk,79
+fractal_task_tools/__init__.py,sha256=PcOgryhg28_2__bAMe68Hp1V7Iuaqnh-qpDVFRJOIYw,80
 fractal_task_tools/_args_schemas.py,sha256=Ka5IAAEdC7xg03ZHMl5jFbv4Sk8JR1QKbxFl7soevlQ,7829
-fractal_task_tools/_cli.py,sha256=2yxGcktEwHYXrRg_KxhO94xqovYkapBSQZNes94v_so,2458
+fractal_task_tools/_cli.py,sha256=ARy3PWjAr92hBk0ZHnFIEAqTskipBIaLRW6COTJ4X-k,2936
 fractal_task_tools/_cli_tools.py,sha256=6G7zXvL6o5t7n4HvVAqP6an0o7qx5fEau5KjtoDXFuc,2622
-fractal_task_tools/_create_manifest.py,sha256=kN_WPJMYz-4vPQ8RYUcLbGW6g8kWjs24J-rtrSXU1Eo,5219
+fractal_task_tools/_create_manifest.py,sha256=aPolxXH5Ug1xh_g5acuEF_GdMCYWApZnrb_N8gA3sqg,5796
 fractal_task_tools/_deepdiff.py,sha256=Or9wO0E9Icb_ki_DTjIdgJKd4JpSJrk8UL3DqqUf-5g,2241
 fractal_task_tools/_descriptions.py,sha256=qYwmpN11UYUmW-PH85ZrHJ3gB6bVjJZ52V9I9Rad3-w,7975
 fractal_task_tools/_package_name_tools.py,sha256=9CyzFwOw4akvQc5GViBm4g-vU8pCc0ULh9hs3b_7VCY,823
@@ -13,9 +13,9 @@ fractal_task_tools/_task_docs.py,sha256=aEXozSKf3a7weOwJMHyTVJTvHlCKgDr1qoU-AAO3
 fractal_task_tools/_titles.py,sha256=GLWn-06fgQD6qzOM75H59EV0MMCXc8jVpHqGanYzNbw,3000
 fractal_task_tools/task_models.py,sha256=4qBDUAoqIgdfAV-7CKkVO5--Y_2Y6CflNVMIiwJxn9g,4177
 fractal_task_tools/task_wrapper.py,sha256=dhphKgxDm4EUxZnsrAy20hJPD6bGdqx7tNg9N_QzlCo,1878
-fractal_task_tools-0.0.9.dist-info/licenses/LICENSE,sha256=1SGAsQ3Jm_nIU7c2TgtTZe_IOKjm9BDsrcf2r98xrdk,1584
-fractal_task_tools-0.0.9.dist-info/METADATA,sha256=FTnMNU5H7uqrUnTIQsjmHa_3hTFeac7z2EmoCmBnlb4,4638
-fractal_task_tools-0.0.9.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-fractal_task_tools-0.0.9.dist-info/entry_points.txt,sha256=zE4qv7QhuiqN6DaPkmJV18X1xyYoUi0HIJ-uAg2M6TU,66
-fractal_task_tools-0.0.9.dist-info/top_level.txt,sha256=2VBpiMDIBMJGOEPiHHX3njYEZGLhr4L0nu8vfkcNVzw,19
-fractal_task_tools-0.0.9.dist-info/RECORD,,
+fractal_task_tools-0.0.11.dist-info/licenses/LICENSE,sha256=1SGAsQ3Jm_nIU7c2TgtTZe_IOKjm9BDsrcf2r98xrdk,1584
+fractal_task_tools-0.0.11.dist-info/METADATA,sha256=8_5ecJ8jId-B81i_4Yf3uovR9nZl56wDxxuUe6BuGGg,4716
+fractal_task_tools-0.0.11.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+fractal_task_tools-0.0.11.dist-info/entry_points.txt,sha256=zE4qv7QhuiqN6DaPkmJV18X1xyYoUi0HIJ-uAg2M6TU,66
+fractal_task_tools-0.0.11.dist-info/top_level.txt,sha256=2VBpiMDIBMJGOEPiHHX3njYEZGLhr4L0nu8vfkcNVzw,19
+fractal_task_tools-0.0.11.dist-info/RECORD,,

{fractal_task_tools-0.0.9.dist-info → fractal_task_tools-0.0.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any