Skip to content

Commit b1362d6

Browse files
committed
refactor(cli): move CWL executor package from diracx-api to diracx-cli
The executor is a CLI tool (dirac-cwl-run entry point), not an API component. Moves source and tests to diracx-cli, updates cwltool dependency location, and rewrites test_no_cwltool_import to verify the mypyc compatibility patch is installed before cwltool loads. chore: update lockfile chore: update .gitignore
1 parent bce49e3 commit b1362d6

16 files changed

Lines changed: 4925 additions & 1009 deletions

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ pip-log.txt
3737
.tox
3838
.ruff_cache
3939
.mypy_cache
40+
workernode
41+
4042

4143
# Eclipse
4244
.project

diracx-api/pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ classifiers = [
1313
"Topic :: System :: Distributed Computing",
1414
]
1515
dependencies = [
16-
"cwltool",
1716
"diracx-client",
1817
"diracx-core",
1918
"httpx",

diracx-api/tests/test_no_cwltool_import.py

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

diracx-cli/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ classifiers = [
1414
]
1515
dependencies = [
1616
"diraccfg", # TODO: Should this be an extra
17+
"cwltool",
1718
"diracx-api",
1819
"diracx-client",
1920
"diracx-core",
@@ -35,7 +36,7 @@ types = [
3536

3637
[project.scripts]
3738
dirac = "diracx.cli:app"
38-
dirac-cwl-run = "diracx.api.executor.__main__:cli"
39+
dirac-cwl-run = "diracx.cli.executor.__main__:cli"
3940

4041
[project.entry-points."diracx.cli"]
4142
jobs = "diracx.cli.jobs:app"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)