janware/jw-pkg
1
Code Pull requests Activity Actions

Improve CmdPythonpath / mypy_path generation #10

Merged
Jan Lindemann merged 4 commits from jan/feature/20260611-feature/20260611-better-mypy-path into master 2026-06-11 12:48:14 +02:00 AGit
Conversation 0 Commits 4 Files changed 4 +36 -45
Jan Lindemann commented 2026-06-11 12:40:57 +02:00
Owner
Copy link

Improve CmdPythonpath / mypy_path generation

This PR presents a series of commits making the generation of mypy_path for pyproject.toml a little less involved. It does so via enhancing infrastructure support in App and CmdPythonpath. The changes to Pythonpath make it gravitate towards a more generic CmdSubpath command. Could be useful for unifiying it with other commands like CmdLdlibpath, CmdExepath.

App: Support --topdir-format "relative"

The global --topdir-format option governs how a project's root directory is represented in paths output by various queries. "absolute" means as absolute path, "unaltered" means verbatim as specified via --topdir, make:xyz means replaced by the string $(xyz), for later expansion in a makefile variable.

This commit adds another variant: "relative" yields the shortest possible output format of the output path in question relative to --topdir, with "shortest possible" in this context meaning canonicalized and leading "./" stripped.

cmds.projects.CmdPythonpath: Opts subdir, delimiter, prefix

Support additional options:

--subdir makes the command look for these existing subdirectories. Can be specified multiple times.

--delimiter Does the obvious and defaults to ":"

--prefix A string to prepend verbatim before each path component

py-topdir.mk: Use pythonpath --prefix for mypy_path

Make use of the newly introduced --prefix option to the pythonpath command, and generate what's subseqently used to fill in mypy_path in pyproject.toml.

By decoupling it from PYTHONPATH, this commit makes the creation of mypy_path less involved and easier to understand. It also obviates the need replace the relatively heavy ldlibpath.mk by the relatively lightweight projects.mk, thereby enhancing performance.

build.cmds.CmdPythonpathOrig: Remove

Remove CmdPythonpathOrig. Its only purpose has ever been to document and try out how cmd_pythonpath_orig() had worked in an ancient application version, that purpose is now served.

# Improve CmdPythonpath / mypy_path generation This PR presents a series of commits making the generation of mypy_path for pyproject.toml a little less involved. It does so via enhancing infrastructure support in App and CmdPythonpath. The changes to Pythonpath make it gravitate towards a more generic CmdSubpath command. Could be useful for unifiying it with other commands like CmdLdlibpath, CmdExepath. #### App: Support --topdir-format "relative" The global --topdir-format option governs how a project's root directory is represented in paths output by various queries. "absolute" means as absolute path, "unaltered" means verbatim as specified via --topdir, make:xyz means replaced by the string $(xyz), for later expansion in a makefile variable. This commit adds another variant: "relative" yields the shortest possible output format of the output path in question relative to --topdir, with "shortest possible" in this context meaning canonicalized and leading "./" stripped. #### cmds.projects.CmdPythonpath: Opts subdir, delimiter, prefix Support additional options: --subdir makes the command look for these existing subdirectories. Can be specified multiple times. --delimiter Does the obvious and defaults to ":" --prefix A string to prepend verbatim before each path component #### py-topdir.mk: Use pythonpath --prefix for mypy_path Make use of the newly introduced --prefix option to the pythonpath command, and generate what's subseqently used to fill in mypy_path in pyproject.toml. By decoupling it from PYTHONPATH, this commit makes the creation of mypy_path less involved and easier to understand. It also obviates the need replace the relatively heavy ldlibpath.mk by the relatively lightweight projects.mk, thereby enhancing performance. #### build.cmds.CmdPythonpathOrig: Remove Remove CmdPythonpathOrig. Its only purpose has ever been to document and try out how cmd_pythonpath_orig() had worked in an ancient application version, that purpose is now served. 
The global --topdir-format option governs how a project's root directory is represented in paths output by various queries. "absolute" means as absolute path, "unaltered" means verbatim as specified via --topdir, make:xyz means replaced by the string $(xyz), for later expansion in a makefile variable.
This commit adds another variant: "relative" yields the shortest possible output format of the output path in question relative to --topdir, with "shortest possible" in this context meaning canonicalized and leading "./" stripped.
Signed-off-by: Jan Lindemann <jan@janware.com>
Support additional options:
  --subdir    makes the command look for these existing
              subdirectories. Can be specified multiple times.
--delimiter Does the obvious and defaults to ":"
--prefix    A string to prepend verbatim before each path component
Signed-off-by: Jan Lindemann <jan@janware.com>
Make use of the newly introduced --prefix option to the pythonpath command, and generate what's subseqently used to fill in mypy_path in pyproject.toml.
By decoupling it from PYTHONPATH, this commit makes the creation of mypy_path less involved and easier to understand. It also obviates the need replace the relatively heavy ldlibpath.mk by the relatively lightweight projects.mk, thereby enhancing performance.
Signed-off-by: Jan Lindemann <jan@janware.com>
build.cmds.CmdPythonpathOrig: Remove
All checks were successful
CI / Packaging - Kali Linux (pull_request) Successful in 3m35s
Details
CI / Packaging - OpenSUSE Tumbleweed (pull_request) Successful in 3m39s
Details
CI / Packaging test (pull_request) Successful in 0s
Details
CI / Packaging - Kali Linux (push) Successful in 3m32s
Details
CI / Packaging - OpenSUSE Tumbleweed (push) Successful in 4m29s
Details
CI / Packaging test (push) Successful in 0s
Details
f153a990a7
 
Remove CmdPythonpathOrig. Its only purpose has ever been to document and try out how  cmd_pythonpath_orig() had worked in an ancient application version, that purpose is now served.
Signed-off-by: Jan Lindemann <jan@janware.com>
Jan Lindemann scheduled this pull request to auto merge when all checks succeed 2026-06-11 12:40:58 +02:00
Jan Lindemann changed title from build.cmds.CmdPythonpathOrig: Remove to Improve CmdPythonpath / mypy_path generation 2026-06-11 12:42:27 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
janware/jw-pkg!10
No description provided.