Merge branch 'main' into resource_requirements

Author: Stellatsuu

.github/workflows/main.yml

@@ -14,6 +14,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Install Pixi
         uses: prefix-dev/setup-pixi@v0.8.1
@@ -26,6 +28,14 @@ jobs:
           pixi list --locked
         shell: bash
 
+      - name: Validate commit messages
+        if: github.event_name == 'pull_request'
+        run: |
+          pixi run check-commits
+        shell: pixi run bash -e {0}
+        env:
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
+
       - name: Run pre-commit
         run: |
           pixi run pre-commit-install

.gitlint

@@ -0,0 +1,3 @@
+[general]
+contrib=CT1
+ignore=B6

.pre-commit-config.yaml

@@ -19,6 +19,12 @@ repos:
         args: ["--fix"]
       - id: ruff-format
 
+  - repo: https://github.com/jorisroovers/gitlint
+    rev: v0.19.1
+    hooks:
+      - id: gitlint
+        stages: [commit-msg]
+
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.7.1
     hooks:

CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## [1.2.0](https://github.com/DIRACGrid/dirac-cwl/compare/v1.1.3...v1.2.0) (2026-02-20)
+
+
+### Features
+
+* **executor:** deal with remote PFNs ([#122](https://github.com/DIRACGrid/dirac-cwl/issues/122)) ([d96cb63](https://github.com/DIRACGrid/dirac-cwl/commit/d96cb633e9ae9dc325fee9bc2b4bd247306f7206))
+
+## [1.1.3](https://github.com/DIRACGrid/dirac-cwl/compare/v1.1.2...v1.1.3) (2026-02-17)
+
+
+### Bug Fixes
+
+* **executor:** run pure_python hook before ANY cwltool import ([#120](https://github.com/DIRACGrid/dirac-cwl/issues/120)) ([747a4b2](https://github.com/DIRACGrid/dirac-cwl/commit/747a4b239288ed78987b2179ee8802ea5d27ba8c))
+
+## [1.1.2](https://github.com/DIRACGrid/dirac-cwl/compare/v1.1.1...v1.1.2) (2026-02-17)
+
+
+### Bug Fixes
+
+* move mypy to optional-deps ([#118](https://github.com/DIRACGrid/dirac-cwl/issues/118)) ([d59d4c0](https://github.com/DIRACGrid/dirac-cwl/commit/d59d4c04a7f1d1fe9a47f4ebcd908c95e2d42d64))
+
+## [1.1.1](https://github.com/DIRACGrid/dirac-cwl/compare/v1.1.0...v1.1.1) (2026-02-16)
+
+
+### Bug Fixes
+
+* remove library-level basicConfig and clean up logging ([#113](https://github.com/DIRACGrid/dirac-cwl/issues/113)) ([5c8f200](https://github.com/DIRACGrid/dirac-cwl/commit/5c8f2008d9c91212d920fc062a8ed1cec48b214d))
+
 ## [1.1.0](https://github.com/DIRACGrid/dirac-cwl/compare/v1.0.2...v1.1.0) (2026-02-06)
 
 

pixi.lock

@@ -31,7 +31,6 @@ dependencies = [
     "diracx-client>=0.0.8",
     "diracx-cli>=0.0.8",
     "lbprodrun",
-    "mypy",              # usually dev-only, see note below
     "pydantic",
     "pyyaml",
     "typer",
@@ -41,7 +40,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-testing = ["pytest>=6", "pytest-mock"]
+testing = ["pytest>=6", "pytest-mock", "mypy"]
 
 [project.scripts]
 dirac-cwl = "dirac_cwl:app"
@@ -113,6 +112,7 @@ pytest-asyncio = ">=1.3.0,<2"
 # Ensure the package is installed in editable mode in the Pixi environment
 [tool.pixi.pypi-dependencies]
 dirac-cwl = { path = ".", editable = true }
+gitlint-core = "*"
 
 [tool.pixi.tasks]
 help = "echo 'Available tasks: test, lint, schemas, schemas-json, schemas-yaml, clean-schemas, test-schemas, check-schemas, validate-schemas'"
@@ -179,5 +179,8 @@ print('All schemas are valid!')
 "
 """
 
-pre-commit-install = "pre-commit install"
+pre-commit-install = "pre-commit install --hook-type pre-commit --hook-type commit-msg"
 pre-commit-run = "pre-commit run -a"
+
+# Validate commit messages on current branch against main
+check-commits = { cmd = "bash -c 'gitlint --commits ${BASE_SHA:-$(git merge-base HEAD origin/main)}..HEAD'" }

pyproject.toml

@@ -9,8 +9,6 @@
 from dirac_cwl.production import app as production_app
 from dirac_cwl.transformation import app as transformation_app
 
-logging.basicConfig(level=logging.DEBUG, format="%(asctime)s | %(name)s | %(levelname)s | %(message)s")
-
 try:
     __version__ = version("dirac-cwl")
 except PackageNotFoundError:
@@ -19,6 +17,16 @@
 
 app = typer.Typer()
 
+
+@app.callback(invoke_without_command=True)
+def _configure_logging():
+    """Configure logging when the CLI is invoked (not on import)."""
+    logging.basicConfig(
+        level=logging.DEBUG,
+        format="%(asctime)s | %(name)s | %(levelname)s | %(message)s",
+    )
+
+
 # Add sub-apps
 app.add_typer(production_app, name="production")
 app.add_typer(transformation_app, name="transformation")

src/dirac_cwl/__init__.py

@@ -4,6 +4,13 @@
 functionality, including replica map management.
 """
 
-from .executor import DiracExecutor, dirac_executor_factory
+# Install the mypyc compatibility hook before any cwltool import.
+# executor.py imports cwltool.executors which transitively imports
+# cwltool.command_line_tool — the hook must be in place first.
+from ._mypyc_compat import install as _install_pure_python_hook
+
+_install_pure_python_hook()
+
+from .executor import DiracExecutor, dirac_executor_factory  # noqa: E402
 
 __all__ = ["DiracExecutor", "dirac_executor_factory"]