duty 1.2.0__py3-none-any.whl → 1.3.0__py3-none-any.whl

duty/debug.py

@@ -37,6 +37,8 @@ class Environment:
     """Python interpreter name."""
     interpreter_version: str
     """Python interpreter version."""
+    interpreter_path: str
+    """Path to Python executable."""
     platform: str
     """Operating System."""
     packages: list[Package]
@@ -83,6 +85,7 @@ def get_debug_info() -> Environment:
     return Environment(
         interpreter_name=py_name,
         interpreter_version=py_version,
+        interpreter_path=sys.executable,
         platform=platform.platform(),
         variables=[Variable(var, val) for var in variables if (val := os.getenv(var))],
         packages=[Package(pkg, get_version(pkg)) for pkg in packages],
@@ -93,7 +96,7 @@ def print_debug_info() -> None:
     """Print debug/environment information."""
     info = get_debug_info()
     print(f"- __System__: {info.platform}")
-    print(f"- __Python__: {info.interpreter_name} {info.interpreter_version}")
+    print(f"- __Python__: {info.interpreter_name} {info.interpreter_version} ({info.interpreter_path})")
     print("- __Environment variables__:")
     for var in info.variables:
         print(f"  - `{var.name}`: `{var.value}`")

duty/validation.py

@@ -9,9 +9,21 @@ from __future__ import annotations
 
 import sys
 import textwrap
+from contextlib import suppress
 from functools import cached_property
 from inspect import Parameter, Signature, signature
-from typing import Any, Callable, Sequence
+from typing import Any, Callable, ForwardRef, Sequence, Union, get_args, get_origin
+
+# TODO: Update once support for Python 3.9 is dropped.
+if sys.version_info < (3, 10):
+    from eval_type_backport import eval_type_backport as eval_type
+
+    union_types = (Union,)
+else:
+    from types import UnionType
+    from typing import _eval_type as eval_type  # type: ignore[attr-defined]
+
+    union_types = (Union, UnionType)
 
 
 def to_bool(value: str) -> bool:
@@ -40,6 +52,12 @@ def cast_arg(arg: Any, annotation: Any) -> Any:
         return arg
     if annotation is bool:
         annotation = to_bool
+    if get_origin(annotation) in union_types:
+        for sub_annotation in get_args(annotation):
+            if sub_annotation is type(None):
+                continue
+            with suppress(Exception):
+                return cast_arg(arg, sub_annotation)
     try:
         return annotation(arg)
     except Exception:  # noqa: BLE001
@@ -65,11 +83,9 @@ class ParamsCaster:
         Returns:
             The position of the variable positional parameter.
         """
-        pos = 0
-        for param in self.params_list:
+        for pos, param in enumerate(self.params_list):
             if param.kind is Parameter.VAR_POSITIONAL:
                 return pos
-            pos += 1
         return -1
 
     @cached_property
@@ -175,6 +191,7 @@ def _get_params_caster(func: Callable, *args: Any, **kwargs: Any) -> ParamsCaste
         if exec_globals[name] is annotations:
             eval_str = True
             del exec_globals[name]
+            break
     exec_globals["__context_above"] = {}
 
     # Don't keep first parameter: context.
@@ -188,9 +205,10 @@ def _get_params_caster(func: Callable, *args: Any, **kwargs: Any) -> ParamsCaste
                 param.kind,
                 default=param.default,
                 annotation=(
-                    eval(  # noqa: PGH001,S307
-                        param.annotation,
+                    eval_type(
+                        ForwardRef(param.annotation) if isinstance(param.annotation, str) else param.annotation,
                         exec_globals,
+                        {},
                     )
                     if param.annotation is not Parameter.empty
                     else type(param.default)

{duty-1.2.0.dist-info → duty-1.3.0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: duty
-Version: 1.2.0
+Version: 1.3.0
 Summary: A simple task runner.
-Keywords: task-runner task runner cross-platform
-Author-Email: Timothée Mazzucotelli <pawamoy@pm.me>
+Keywords: task-runner,task,runner,cross-platform
+Author-Email: =?utf-8?q?Timoth=C3=A9e_Mazzucotelli?= <dev@pawamoy.fr>
 License: ISC
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Documentation
 Classifier: Topic :: Software Development
 Classifier: Topic :: Utilities
@@ -28,15 +29,16 @@ Project-URL: Discussions, https://github.com/pawamoy/duty/discussions
 Project-URL: Gitter, https://gitter.im/duty/community
 Project-URL: Funding, https://github.com/sponsors/pawamoy
 Requires-Python: >=3.8
+Requires-Dist: eval-type-backport; python_version < "3.10"
 Requires-Dist: failprint!=1.0.0,>=0.11
 Description-Content-Type: text/markdown
 
 # duty
 
 [![ci](https://github.com/pawamoy/duty/workflows/ci/badge.svg)](https://github.com/pawamoy/duty/actions?query=workflow%3Aci)
-[![documentation](https://img.shields.io/badge/docs-mkdocs%20material-blue.svg?style=flat)](https://pawamoy.github.io/duty/)
+[![documentation](https://img.shields.io/badge/docs-mkdocs-708FCC.svg?style=flat)](https://pawamoy.github.io/duty/)
 [![pypi version](https://img.shields.io/pypi/v/duty.svg)](https://pypi.org/project/duty/)
-[![gitpod](https://img.shields.io/badge/gitpod-workspace-blue.svg?style=flat)](https://gitpod.io/#https://github.com/pawamoy/duty)
+[![gitpod](https://img.shields.io/badge/gitpod-workspace-708FCC.svg?style=flat)](https://gitpod.io/#https://github.com/pawamoy/duty)
 [![gitter](https://badges.gitter.im/join%20chat.svg)](https://app.gitter.im/#/room/#duty:gitter.im)
 
 A simple task runner.

{duty-1.2.0.dist-info → duty-1.3.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-duty-1.2.0.dist-info/METADATA,sha256=tfki6IuLH8oKRFwO-ey-lyrrWbBh5oZtLn1hEunu-fI,2717
-duty-1.2.0.dist-info/WHEEL,sha256=N2J68yzZqJh3mI_Wg92rwhw0rtJDFpZj9bwQIMJgaVg,90
-duty-1.2.0.dist-info/entry_points.txt,sha256=gxDUGvj_bg7DA77MogNmnGQSc2__ri9kAEp2RJ1p60Q,40
-duty-1.2.0.dist-info/licenses/LICENSE,sha256=nQxdYSduhkgEpOTmg4yyIMmFPzcr2qrlUl8Tf9QZPug,754
+duty-1.3.0.dist-info/METADATA,sha256=Z_a3NfoAhbBn6wUHNHWIa9oJ5-l5t3CeSeoqv247WME,2837
+duty-1.3.0.dist-info/WHEEL,sha256=7sv5iXvIiTVJSnAxCz2tGBm9DHsb2vPSzeYeT7pvGUY,90
+duty-1.3.0.dist-info/entry_points.txt,sha256=gxDUGvj_bg7DA77MogNmnGQSc2__ri9kAEp2RJ1p60Q,40
+duty-1.3.0.dist-info/licenses/LICENSE,sha256=nQxdYSduhkgEpOTmg4yyIMmFPzcr2qrlUl8Tf9QZPug,754
 duty/__init__.py,sha256=2fdBMNEBXYSCnV1GQm56VGe8VuvMp79-Hj3SHrAb5MM,144
 duty/__main__.py,sha256=4YvloGDKmyVzOsE6ZdyCQyY0Jsl0LSlbqkO2UDExgmI,333
 duty/callables/__init__.py,sha256=U1vfn41ZtDDdje9yLwmrdcoJ8jxANARdTCvZ8paX8W0,1661
@@ -22,9 +22,9 @@ duty/callables/ssort.py,sha256=Lqak-xfJtKkj3AaI4_jPeaRkZ9SbvMCYhoUIVVHE6s8,842
 duty/cli.py,sha256=s62m0HO4PwdxutVX1P0H_a0yPN-mVOE5VYEJkRvJCRA,8436
 duty/collection.py,sha256=cri--t6aUmOw3c17yCy9tAp_ceHfEQMhf4tMqPssNa0,6590
 duty/context.py,sha256=aH1CPLnlHMnMaHc-cGTBv-xZioSLQxNIDo1xcQGuiO8,2985
-duty/debug.py,sha256=o-g8vpvl48STTQ3SKPNroJ3sqYvivbhmmya2zo3adQ4,2683
+duty/debug.py,sha256=9stdqxNJ9zA2HWsYfmy3C9BrWOXLlHYRGsQ6dHfCUfM,2813
 duty/decorator.py,sha256=1IVYNOeVhLv4OkFtXAXcFKyy8xypfQBh3WM8aJLKohU,2986
 duty/exceptions.py,sha256=gTtqtqOiMroP5-83kC5jakuwBfYKpzCQHE9RWfAGRv0,358
 duty/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-duty/validation.py,sha256=f_H3KNWNtGgkPQSU18Q5esX3A2af6t2m_I_PnqkggOI,7305
-duty-1.2.0.dist-info/RECORD,,
+duty/validation.py,sha256=1teu9-04anIShuOeWVcqhXLfvWOFKTSRdrclsGMZxdU,8052
+duty-1.3.0.dist-info/RECORD,,

{duty-1.2.0.dist-info → duty-1.3.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: pdm-backend (2.1.8)
+Generator: pdm-backend (2.2.1)
 Root-Is-Purelib: true
 Tag: py3-none-any