Be more consistent with organizing tool.pdm.scripts and tool.doit.tasks.

pyproject.toml

@@ -132,6 +132,8 @@ lint-fix = { composite = [
 
 # Most Tests
 test = { cmd = "pytest", help="run all pytest tests" }
+test-quick.cmd = "pytest -k \"test_top or test_upstream or test_witness\""
+test-quick.help = "run quick subset of pytest tests"
 
 # Generate
 gen = { call = "sentinel.gen:generate", help="generate Sentinel Verilog file" }
@@ -178,43 +180,28 @@ rvformal-all = { composite = [
     "doit run_sby:setup",  # serially generate RISC-V Formal files to avoid race condition
     "doit {args:-n 2} run_sby"
 ], help="run all RISC-V Formal tests" }
+rvformal-status.cmd = "doit list_sby_status:{args}"
+rvformal-status.help="list a single RISC-V Formal test's status"
+rvformal-status-all.cmd = "doit list_sby_status"
+rvformal-status-all.help="list all RISC-V Formal tests' status"
 
 # RISCOF
 riscof-all = { cmd = "doit run_riscof", help="run all RISCOF tests"}
+riscof-override.cmd = "doit run_riscof -t {args}"
+riscof-override.help = "run RISCOF with custom testfile"
 
-[tool.pdm.scripts._add-ruff]
-cmd = "pdm add --dev -G lint ruff"
-env = { CARGO_PROFILE_RELEASE_LTO="false" }
-help = "add Ruff linter on MSYS2- work around Rust issue #109797"
-
-[tool.pdm.scripts._update-ruff]
-cmd = "pdm update --dev -G lint ruff"
-env = { CARGO_PROFILE_RELEASE_LTO="false" }
-help = "update Ruff linter on MSYS2- work around Rust issue #109797"
-
-[tool.pdm.scripts.test-quick]
-cmd = "pytest -k \"test_top or test_upstream or test_witness\""
-help = "run quick subset of pytest tests"
-
-[tool.pdm.scripts.rvformal-status]
-cmd = "doit list_sby_status:{args}"
-help="list a single RISC-V Formal test's status"
-
-[tool.pdm.scripts.rvformal-status-all]
-cmd = "doit list_sby_status"
-help="list all RISC-V Formal tests' status"
-
-[tool.pdm.scripts.riscof-override]
-cmd = "doit run_riscof -t {args}"
-help = "run RISCOF with custom testfile"
+# Private
+_add-ruff.cmd = "pdm add --dev -G lint ruff"
+_add-ruff.env = { CARGO_PROFILE_RELEASE_LTO="false" }
+_add-ruff.help = "add Ruff linter on MSYS2- work around Rust issue #109797"
+_update-ruff.cmd = "pdm update --dev -G lint ruff"
+_update-ruff.env = { CARGO_PROFILE_RELEASE_LTO="false" }
+_update-ruff.help = "update Ruff linter on MSYS2- work around Rust issue #109797"
 
 # Demo development helpers.
-[tool.doit.tasks._make_rand_firmware]
-platform = "ice40_hx8k_b_evn"
-interface = "csr"
-
-[tool.doit.tasks._program_rust_firmware]
-programmer = "ofl"
+[tool.doit.tasks]
+_make_rand_firmware = { platform = "ice40_hx8k_b_evn", interface = "csr"}
+_program_rust_firmware = { programmer = "ofl" }
 
 [dependency-groups]
 doc = [